extensions: Compile c/b/extensions files on Android where possible

Detect the "leaf nodes" in the include tree in a recursive manner with
an ad-hoc script and update the code manually so that build passes.

Bug: b/392777363

Change-Id: I384f6d0e6ad56bc658b543a389777d03211cd2ca
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6276365
Reviewed-by: James Cook <jamescook@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Auto-Submit: Keigo Oka <oka@chromium.org>
Commit-Queue: Keigo Oka <oka@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1422964}

chrome/app/chrome_main_delegate.cc

@@ -204,7 +204,7 @@
 #endif
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/startup_helper.h"
+#include "chrome/browser/extensions/startup_helper.h"  // nogncheck
 #include "extensions/common/constants.h"
 #endif
 

chrome/app/generated_resources.grd

@@ -5783,7 +5783,7 @@ are declared in tools/grit/grit_args.gni.
       </if>
 
       <!-- Extension installed bubble -->
-      <if expr="enable_extensions">
+      <if expr="enable_extensions_core">
         <if expr="is_macosx">
           <message name="IDS_EXTENSION_INSTALLED_APP_INFO" desc="Text displayed inside a link when an app is installed. Clicking this link opens up the New Tab Page to show the app's icon.">
             Show me

chrome/browser/extensions/BUILD.gn

@@ -47,19 +47,101 @@ source_set("extensions") {
     "activity_log/database_string_table.h",
     "activity_log/fullstream_ui_policy.cc",
     "activity_log/fullstream_ui_policy.h",
+    "api/bookmarks/bookmarks_api_watcher.cc",
+    "api/bookmarks/bookmarks_api_watcher.h",
+    "api/bookmarks_core/bookmarks_function.cc",
+    "api/bookmarks_core/bookmarks_function.h",
+    "api/declarative_content/content_condition.cc",
+    "api/declarative_content/content_condition.h",
+    "api/declarative_content/content_predicate.cc",
+    "api/declarative_content/content_predicate.h",
+    "api/declarative_content/content_predicate_evaluator.cc",
+    "api/declarative_content/content_predicate_evaluator.h",
+    "api/declarative_content/declarative_content_css_condition_tracker.cc",
+    "api/declarative_content/declarative_content_css_condition_tracker.h",
+    "api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc",
+    "api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h",
+    "api/declarative_content/declarative_content_page_url_condition_tracker.cc",
+    "api/declarative_content/declarative_content_page_url_condition_tracker.h",
+    "api/declarative_content/default_content_predicate_evaluators.cc",
+    "api/declarative_content/default_content_predicate_evaluators.h",
     "api/developer_private/developer_private_event_router_shared.cc",
     "api/developer_private/developer_private_event_router_shared.h",
     "api/developer_private/developer_private_functions.h",
     "api/developer_private/developer_private_functions_shared.cc",
     "api/developer_private/developer_private_functions_shared.h",
+    "api/identity/extension_token_key.cc",
+    "api/identity/extension_token_key.h",
+    "api/identity/identity_constants.cc",
+    "api/identity/identity_constants.h",
+    "api/identity/identity_get_auth_token_error.cc",
+    "api/identity/identity_get_auth_token_error.h",
+    "api/identity/identity_mint_queue.cc",
+    "api/identity/identity_mint_queue.h",
+    "api/identity/identity_token_cache.cc",
+    "api/identity/identity_token_cache.h",
+    "api/identity/launch_web_auth_flow_delegate.h",
+    "api/identity/web_auth_flow_info_bar_delegate.cc",
+    "api/identity/web_auth_flow_info_bar_delegate.h",
+    "api/messaging/native_messaging_host_manifest.cc",
+    "api/messaging/native_messaging_host_manifest.h",
+    "api/metrics_private/chrome_metrics_private_delegate.cc",
+    "api/metrics_private/chrome_metrics_private_delegate.h",
+    "api/preference/cookie_controls_mode_transformer.cc",
+    "api/preference/cookie_controls_mode_transformer.h",
+    "api/preference/network_prediction_transformer.cc",
+    "api/preference/network_prediction_transformer.h",
+    "api/preference/privacy_sandbox_transformer.cc",
+    "api/preference/privacy_sandbox_transformer.h",
+    "api/preference/protected_content_enabled_transformer.cc",
+    "api/preference/protected_content_enabled_transformer.h",
+    "api/proxy/proxy_api_constants.cc",
+    "api/proxy/proxy_api_constants.h",
+    "api/proxy/proxy_api_helpers.cc",
+    "api/proxy/proxy_api_helpers.h",
+    "api/proxy/proxy_pref_transformer.cc",
+    "api/proxy/proxy_pref_transformer.h",
+    "api/sessions/session_id.cc",
+    "api/sessions/session_id.h",
+    "api/storage/policy_value_store.cc",
+    "api/storage/policy_value_store.h",
+    "api/storage/setting_sync_data.cc",
+    "api/storage/setting_sync_data.h",
+    "api/tabs/tabs_constants.h",
     "api/tabs/windows_util.cc",
     "api/tabs/windows_util.h",
+    "api/top_sites/top_sites_api.cc",
+    "api/top_sites/top_sites_api.h",
+    "blocklist_state_fetcher.cc",
+    "blocklist_state_fetcher.h",
+    "bookmark_app_util.cc",
+    "bookmark_app_util.h",
+    "bookmarks/bookmarks_error_constants.cc",
+    "bookmarks/bookmarks_error_constants.h",
+    "chrome_app_icon.cc",
+    "chrome_app_icon.h",
+    "chrome_app_icon_delegate.h",
     "chrome_extensions_browser_api_provider.cc",
     "chrome_extensions_browser_api_provider.h",
+    "chrome_url_request_util.cc",
+    "chrome_url_request_util.h",
+    "component_extensions_allowlist/allowlist.cc",
+    "component_extensions_allowlist/allowlist.h",
+    "convert_user_script.cc",
+    "convert_user_script.h",
+    "delayed_install_manager.cc",
+    "delayed_install_manager.h",
     "error_console/error_console.cc",
     "error_console/error_console.h",
     "error_console/error_console_factory.cc",
     "error_console/error_console_factory.h",
+    "event_router_forwarder.cc",
+    "event_router_forwarder.h",
+    "extension_assets_manager.cc",
+    "extension_assets_manager.h",
+    "extension_error_ui.h",
+    "extension_install_error_menu_item_id_provider.cc",
+    "extension_install_error_menu_item_id_provider.h",
     "extension_install_prompt.cc",
     "extension_install_prompt.h",
     "extension_install_prompt_show_params.cc",
@@ -70,6 +152,8 @@ source_set("extensions") {
     "extension_special_storage_policy.h",
     "extension_tab_util.cc",
     "extension_tab_util.h",
+    "extension_ui_util.cc",
+    "extension_ui_util.h",
     "extension_util.cc",
     "extension_util.h",
     "extension_web_ui.cc",
@@ -78,16 +162,23 @@ source_set("extensions") {
     "extension_web_ui_override_registrar.h",
     "extension_webkit_preferences.cc",
     "extension_webkit_preferences.h",
+    "favicon/favicon_util.cc",
+    "favicon/favicon_util.h",
+    "forced_extensions/assessment_assistant_tracker.cc",
+    "forced_extensions/assessment_assistant_tracker.h",
     "forced_extensions/install_stage_tracker.cc",
     "forced_extensions/install_stage_tracker.h",
     "forced_extensions/install_stage_tracker_factory.cc",
     "forced_extensions/install_stage_tracker_factory.h",
     "install_approval.cc",
     "install_approval.h",
+    "install_gate.h",
     "install_observer.cc",
     "install_observer.h",
     "install_prompt_permissions.cc",
     "install_prompt_permissions.h",
+    "install_signer.cc",
+    "install_signer.h",
     "install_tracker.cc",
     "install_tracker.h",
     "install_tracker_factory.cc",
@@ -95,12 +186,45 @@ source_set("extensions") {
     "load_error_reporter.cc",
     "load_error_reporter.h",
     "manifest_check_level.h",
+    "mv2_experiment_stage.h",
+    "pack_extension_job.cc",
+    "pack_extension_job.h",
+    "pending_extension_info.cc",
+    "pending_extension_info.h",
     "permissions_url_constants.cc",
     "permissions_url_constants.h",
     "policy_handlers.cc",
     "policy_handlers.h",
+    "pref_mapping.cc",
+    "pref_mapping.h",
+    "pref_transformer_interface.h",
+    "preference/preference_helpers.cc",
+    "preference/preference_helpers.h",
+    "profile_util.cc",
+    "profile_util.h",
     "scoped_active_install.cc",
     "scoped_active_install.h",
+    "settings_api_helpers.cc",
+    "settings_api_helpers.h",
+    "startup_helper.cc",
+    "startup_helper.h",
+    "system_display/display_info_provider.h",
+    "updater/chrome_extension_downloader_factory.cc",
+    "updater/chrome_extension_downloader_factory.h",
+    "updater/chrome_update_client_config.cc",
+    "updater/chrome_update_client_config.h",
+    "updater/extension_update_client_command_line_config_policy.cc",
+    "updater/extension_update_client_command_line_config_policy.h",
+    "updater/extension_updater_switches.cc",
+    "updater/extension_updater_switches.h",
+    "user_script_listener.cc",
+    "user_script_listener.h",
+    "webstore_data_fetcher.cc",
+    "webstore_data_fetcher.h",
+    "webstore_data_fetcher_delegate.cc",
+    "webstore_data_fetcher_delegate.h",
+    "webstore_install_helper.cc",
+    "webstore_install_helper.h",
     "window_controller.cc",
     "window_controller.h",
     "window_controller_list.cc",
@@ -113,24 +237,55 @@ source_set("extensions") {
   ]
   deps = [
     "//base",
+    "//chrome/app:command_ids",
+    "//chrome/browser:browser_process",
+    "//chrome/browser/bitmap_fetcher",
     "//chrome/browser/content_settings:content_settings_factory",
+    "//chrome/browser/extensions:cws_item_service_proto",
     "//chrome/browser/extensions/api:api_registration",
+    "//chrome/browser/favicon",
+    "//chrome/browser/google",
+    "//chrome/browser/prefetch",
     "//chrome/browser/prefs",
+    "//chrome/browser/preloading:prefs",
     "//chrome/browser/profiles:profile",
+    "//chrome/browser/safe_browsing",
     "//chrome/common",
+    "//chrome/common/safe_browsing:proto",
+    "//components/bookmarks/browser",
+    "//components/bookmarks/managed",
     "//components/content_settings/core/browser:cookie_settings",
     "//components/crx_file",
+    "//components/embedder_support",
+    "//components/infobars/content",
+    "//components/infobars/core",
     "//components/no_state_prefetch/browser",
     "//components/policy/core/browser",
     "//components/pref_registry",
+    "//components/privacy_sandbox:features",
+    "//components/privacy_sandbox:privacy_sandbox_prefs",
+    "//components/privacy_sandbox:tracking_protection_prefs",
+    "//components/proxy_config",
+    "//components/safe_browsing/core/common",
+    "//components/safe_browsing/core/common:safe_browsing_prefs",
+    "//components/services/patch/content",
+    "//components/services/unzip/content",
+    "//components/spellcheck/browser",
+    "//components/update_client",
+    "//components/update_client:common_impl",
+    "//components/user_prefs",
     "//content/public/browser",
     "//extensions/browser",
+    "//extensions/browser/api/storage:settings_observer",
     "//extensions/browser/updater",
     "//extensions/buildflags",
     "//extensions/common",
+    "//google_apis/common:request_util",
     "//net",
     "//storage/browser",
+    "//third_party/zlib/google:zip",
   ]
+  public_deps = [ "//components/safe_browsing/core/browser/db:util" ]
   defines = []
 
   if (is_android) {
@@ -154,10 +309,6 @@ source_set("extensions") {
       "api/bookmark_manager_private/bookmark_manager_private_api.h",
       "api/bookmarks/bookmarks_api.cc",
       "api/bookmarks/bookmarks_api.h",
-      "api/bookmarks/bookmarks_api_watcher.cc",
-      "api/bookmarks/bookmarks_api_watcher.h",
-      "api/bookmarks_core/bookmarks_function.cc",
-      "api/bookmarks_core/bookmarks_function.h",
       "api/chrome_device_permissions_prompt.h",
       "api/chrome_extensions_api_client.cc",
       "api/chrome_extensions_api_client.h",
@@ -171,20 +322,6 @@ source_set("extensions") {
       "api/declarative_content/chrome_content_rules_registry.h",
       "api/declarative_content/content_action.cc",
       "api/declarative_content/content_action.h",
-      "api/declarative_content/content_condition.cc",
-      "api/declarative_content/content_condition.h",
-      "api/declarative_content/content_predicate.cc",
-      "api/declarative_content/content_predicate.h",
-      "api/declarative_content/content_predicate_evaluator.cc",
-      "api/declarative_content/content_predicate_evaluator.h",
-      "api/declarative_content/declarative_content_css_condition_tracker.cc",
-      "api/declarative_content/declarative_content_css_condition_tracker.h",
-      "api/declarative_content/declarative_content_is_bookmarked_condition_tracker.cc",
-      "api/declarative_content/declarative_content_is_bookmarked_condition_tracker.h",
-      "api/declarative_content/declarative_content_page_url_condition_tracker.cc",
-      "api/declarative_content/declarative_content_page_url_condition_tracker.h",
-      "api/declarative_content/default_content_predicate_evaluators.cc",
-      "api/declarative_content/default_content_predicate_evaluators.h",
       "api/developer_private/developer_private_api.cc",
       "api/developer_private/developer_private_api.h",
       "api/developer_private/developer_private_event_router.cc",
@@ -211,37 +348,24 @@ source_set("extensions") {
       "api/gcm/gcm_api.h",
       "api/history/history_api.cc",
       "api/history/history_api.h",
-      "api/identity/extension_token_key.cc",
-      "api/identity/extension_token_key.h",
       "api/identity/gaia_remote_consent_flow.cc",
       "api/identity/gaia_remote_consent_flow.h",
       "api/identity/identity_api.cc",
       "api/identity/identity_api.h",
       "api/identity/identity_clear_all_cached_auth_tokens_function.cc",
       "api/identity/identity_clear_all_cached_auth_tokens_function.h",
-      "api/identity/identity_constants.cc",
-      "api/identity/identity_constants.h",
       "api/identity/identity_get_accounts_function.cc",
       "api/identity/identity_get_accounts_function.h",
-      "api/identity/identity_get_auth_token_error.cc",
-      "api/identity/identity_get_auth_token_error.h",
       "api/identity/identity_get_auth_token_function.cc",
       "api/identity/identity_get_auth_token_function.h",
       "api/identity/identity_get_profile_user_info_function.cc",
       "api/identity/identity_get_profile_user_info_function.h",
       "api/identity/identity_launch_web_auth_flow_function.cc",
       "api/identity/identity_launch_web_auth_flow_function.h",
-      "api/identity/identity_mint_queue.cc",
-      "api/identity/identity_mint_queue.h",
       "api/identity/identity_remove_cached_auth_token_function.cc",
       "api/identity/identity_remove_cached_auth_token_function.h",
-      "api/identity/identity_token_cache.cc",
-      "api/identity/identity_token_cache.h",
-      "api/identity/launch_web_auth_flow_delegate.h",
       "api/identity/web_auth_flow.cc",
       "api/identity/web_auth_flow.h",
-      "api/identity/web_auth_flow_info_bar_delegate.cc",
-      "api/identity/web_auth_flow_info_bar_delegate.h",
       "api/image_writer_private/destroy_partitions_operation.cc",
       "api/image_writer_private/destroy_partitions_operation.h",
       "api/image_writer_private/error_constants.cc",
@@ -286,10 +410,6 @@ source_set("extensions") {
       "api/messaging/incognito_connectability_infobar_delegate.h",
       "api/messaging/native_message_port.cc",
       "api/messaging/native_message_port.h",
-      "api/messaging/native_messaging_host_manifest.cc",
-      "api/messaging/native_messaging_host_manifest.h",
-      "api/metrics_private/chrome_metrics_private_delegate.cc",
-      "api/metrics_private/chrome_metrics_private_delegate.h",
       "api/passwords_private/password_access_auth_timeout_handler.cc",
       "api/passwords_private/password_access_auth_timeout_handler.h",
       "api/passwords_private/password_check_delegate.cc",
@@ -307,28 +427,12 @@ source_set("extensions") {
       "api/passwords_private/passwords_private_event_router_factory.h",
       "api/passwords_private/passwords_private_utils.cc",
       "api/passwords_private/passwords_private_utils.h",
-      "api/preference/cookie_controls_mode_transformer.cc",
-      "api/preference/cookie_controls_mode_transformer.h",
-      "api/preference/network_prediction_transformer.cc",
-      "api/preference/network_prediction_transformer.h",
-      "api/preference/privacy_sandbox_transformer.cc",
-      "api/preference/privacy_sandbox_transformer.h",
-      "api/preference/protected_content_enabled_transformer.cc",
-      "api/preference/protected_content_enabled_transformer.h",
-      "api/proxy/proxy_api_constants.cc",
-      "api/proxy/proxy_api_constants.h",
-      "api/proxy/proxy_api_helpers.cc",
-      "api/proxy/proxy_api_helpers.h",
-      "api/proxy/proxy_pref_transformer.cc",
-      "api/proxy/proxy_pref_transformer.h",
       "api/runtime/chrome_runtime_api_delegate.cc",
       "api/runtime/chrome_runtime_api_delegate.h",
       "api/safe_browsing_private/safe_browsing_private_event_router.cc",
       "api/safe_browsing_private/safe_browsing_private_event_router.h",
       "api/safe_browsing_private/safe_browsing_private_event_router_factory.cc",
       "api/safe_browsing_private/safe_browsing_private_event_router_factory.h",
-      "api/sessions/session_id.cc",
-      "api/sessions/session_id.h",
       "api/sessions/sessions_api.cc",
       "api/sessions/sessions_api.h",
       "api/settings_private/generated_pref.cc",
@@ -353,10 +457,6 @@ source_set("extensions") {
       "api/side_panel/side_panel_service.h",
       "api/storage/managed_value_store_cache.cc",
       "api/storage/managed_value_store_cache.h",
-      "api/storage/policy_value_store.cc",
-      "api/storage/policy_value_store.h",
-      "api/storage/setting_sync_data.cc",
-      "api/storage/setting_sync_data.h",
       "api/storage/settings_sync_processor.cc",
       "api/storage/settings_sync_processor.h",
       "api/storage/settings_sync_util.cc",
@@ -379,15 +479,12 @@ source_set("extensions") {
       "api/tabs/app_window_controller.h",
       "api/tabs/tabs_api.cc",
       "api/tabs/tabs_api.h",
-      "api/tabs/tabs_constants.h",
       "api/tabs/tabs_event_router.cc",
       "api/tabs/tabs_event_router.h",
       "api/tabs/tabs_windows_api.cc",
       "api/tabs/tabs_windows_api.h",
       "api/tabs/windows_event_router.cc",
       "api/tabs/windows_event_router.h",
-      "api/top_sites/top_sites_api.cc",
-      "api/top_sites/top_sites_api.h",
       "api/webstore_private/extension_install_status.cc",
       "api/webstore_private/extension_install_status.h",
       "api/webstore_private/webstore_private_api.cc",
@@ -398,19 +495,10 @@ source_set("extensions") {
       "blocklist_check.h",
       "blocklist_factory.cc",
       "blocklist_factory.h",
-      "blocklist_state_fetcher.cc",
-      "blocklist_state_fetcher.h",
-      "bookmark_app_util.cc",
-      "bookmark_app_util.h",
-      "bookmarks/bookmarks_error_constants.cc",
-      "bookmarks/bookmarks_error_constants.h",
       "bookmarks/bookmarks_helpers.cc",
       "bookmarks/bookmarks_helpers.h",
       "browser_extension_window_controller.cc",
       "browser_extension_window_controller.h",
-      "chrome_app_icon.cc",
-      "chrome_app_icon.h",
-      "chrome_app_icon_delegate.h",
       "chrome_app_icon_loader.cc",
       "chrome_app_icon_loader.h",
       "chrome_app_icon_service.cc",
@@ -451,22 +539,16 @@ source_set("extensions") {
       "chrome_kiosk_delegate.h",
       "chrome_process_manager_delegate.cc",
       "chrome_process_manager_delegate.h",
-      "chrome_url_request_util.cc",
-      "chrome_url_request_util.h",
       "chrome_zipfile_installer.cc",
       "chrome_zipfile_installer.h",
       "commands/command_service.cc",
       "commands/command_service.h",
-      "component_extensions_allowlist/allowlist.cc",
-      "component_extensions_allowlist/allowlist.h",
       "component_loader.cc",
       "component_loader.h",
       "context_menu_helpers.cc",
       "context_menu_helpers.h",
       "context_menu_matcher.cc",
       "context_menu_matcher.h",
-      "convert_user_script.cc",
-      "convert_user_script.h",
       "corrupted_extension_reinstaller.cc",
       "corrupted_extension_reinstaller.h",
       "crx_installer.cc",
@@ -477,14 +559,10 @@ source_set("extensions") {
       "cws_info_service_factory.h",
       "data_deleter.cc",
       "data_deleter.h",
-      "delayed_install_manager.cc",
-      "delayed_install_manager.h",
       "device_permissions_dialog_controller.cc",
       "device_permissions_dialog_controller.h",
       "devtools_util.cc",
       "devtools_util.h",
-      "event_router_forwarder.cc",
-      "event_router_forwarder.h",
       "extension_action_dispatcher.cc",
       "extension_action_dispatcher.h",
       "extension_action_runner.cc",
@@ -493,8 +571,6 @@ source_set("extensions") {
       "extension_action_storage_manager.h",
       "extension_allowlist.cc",
       "extension_allowlist.h",
-      "extension_assets_manager.cc",
-      "extension_assets_manager.h",
       "extension_browser_window_helper.cc",
       "extension_browser_window_helper.h",
       "extension_commands_global_registry.cc",
@@ -505,7 +581,6 @@ source_set("extensions") {
       "extension_disabled_ui.h",
       "extension_error_controller.cc",
       "extension_error_controller.h",
-      "extension_error_ui.h",
       "extension_error_ui_default.cc",
       "extension_error_ui_default.h",
       "extension_garbage_collector.cc",
@@ -514,8 +589,6 @@ source_set("extensions") {
       "extension_garbage_collector_factory.h",
       "extension_gcm_app_handler.cc",
       "extension_gcm_app_handler.h",
-      "extension_install_error_menu_item_id_provider.cc",
-      "extension_install_error_menu_item_id_provider.h",
       "extension_keybinding_registry.cc",
       "extension_keybinding_registry.h",
       "extension_management.cc",
@@ -542,8 +615,6 @@ source_set("extensions") {
       "extension_sync_util.h",
       "extension_telemetry_service_verdict_handler.cc",
       "extension_telemetry_service_verdict_handler.h",
-      "extension_ui_util.cc",
-      "extension_ui_util.h",
       "extension_uninstall_dialog.cc",
       "extension_uninstall_dialog.h",
       "extension_view.h",
@@ -565,19 +636,12 @@ source_set("extensions") {
       "external_pref_loader.h",
       "external_provider_impl.cc",
       "external_provider_impl.h",
-      "favicon/favicon_util.cc",
-      "favicon/favicon_util.h",
       "file_handlers/file_handling_launch_utils.cc",
       "file_handlers/file_handling_launch_utils.h",
-      "forced_extensions/assessment_assistant_tracker.cc",
-      "forced_extensions/assessment_assistant_tracker.h",
       "forced_extensions/force_installed_metrics.cc",
       "forced_extensions/force_installed_metrics.h",
       "forced_extensions/force_installed_tracker.cc",
       "forced_extensions/force_installed_tracker.h",
-      "install_gate.h",
-      "install_signer.cc",
-      "install_signer.h",
       "install_verifier.cc",
       "install_verifier.h",
       "install_verifier_factory.cc",
@@ -595,15 +659,10 @@ source_set("extensions") {
       "menu_manager_factory.h",
       "mv2_deprecation_impact_checker.cc",
       "mv2_deprecation_impact_checker.h",
-      "mv2_experiment_stage.h",
       "navigation_extension_enabler.cc",
       "navigation_extension_enabler.h",
       "omaha_attributes_handler.cc",
       "omaha_attributes_handler.h",
-      "pack_extension_job.cc",
-      "pack_extension_job.h",
-      "pending_extension_info.cc",
-      "pending_extension_info.h",
       "pending_extension_manager.cc",
       "pending_extension_manager.h",
       "permissions/permissions_updater.cc",
@@ -614,26 +673,14 @@ source_set("extensions") {
       "permissions/site_permissions_helper.h",
       "permissions_based_management_policy_provider.cc",
       "permissions_based_management_policy_provider.h",
-      "pref_mapping.cc",
-      "pref_mapping.h",
-      "pref_transformer_interface.h",
-      "preference/preference_helpers.cc",
-      "preference/preference_helpers.h",
-      "profile_util.cc",
-      "profile_util.h",
       "safe_browsing_verdict_handler.cc",
       "safe_browsing_verdict_handler.h",
-      "settings_api_helpers.cc",
-      "settings_api_helpers.h",
       "shared_module_service.cc",
       "shared_module_service.h",
       "standard_management_policy_provider.cc",
       "standard_management_policy_provider.h",
-      "startup_helper.cc",
-      "startup_helper.h",
       "sync_bundle.cc",
       "sync_bundle.h",
-      "system_display/display_info_provider.h",
       "tab_helper.cc",
       "tab_helper.h",
       "theme_installed_infobar_delegate.cc",
@@ -642,28 +689,12 @@ source_set("extensions") {
       "unpacked_installer.h",
       "update_install_gate.cc",
       "update_install_gate.h",
-      "updater/chrome_extension_downloader_factory.cc",
-      "updater/chrome_extension_downloader_factory.h",
-      "updater/chrome_update_client_config.cc",
-      "updater/chrome_update_client_config.h",
-      "updater/extension_update_client_command_line_config_policy.cc",
-      "updater/extension_update_client_command_line_config_policy.h",
       "updater/extension_updater.cc",
       "updater/extension_updater.h",
-      "updater/extension_updater_switches.cc",
-      "updater/extension_updater_switches.h",
-      "user_script_listener.cc",
-      "user_script_listener.h",
       "warning_badge_service.cc",
       "warning_badge_service.h",
       "warning_badge_service_factory.cc",
       "warning_badge_service_factory.h",
-      "webstore_data_fetcher.cc",
-      "webstore_data_fetcher.h",
-      "webstore_data_fetcher_delegate.cc",
-      "webstore_data_fetcher_delegate.h",
-      "webstore_install_helper.cc",
-      "webstore_install_helper.h",
       "webstore_install_with_prompt.cc",
       "webstore_install_with_prompt.h",
       "webstore_installer.cc",
@@ -720,7 +751,7 @@ source_set("extensions") {
     # However, this means browser_extensions and browser should more or less
     # have the same dependencies. Once browser_extensions is untangled from
     # browser, then we can clean up these dependencies.
-    public_deps = [
+    public_deps += [
       "//chrome/browser:browser_public_dependencies",
       "//chrome/browser/extensions/api:api_registration",
       "//chrome/browser/media/webrtc",
@@ -735,7 +766,6 @@ source_set("extensions") {
       "//chrome/common",
       "//chrome/common/extensions/api",
       "//components/omnibox/browser",
-      "//components/safe_browsing/core/browser/db:util",
       "//components/safe_browsing/core/common/proto:csd_proto",
       "//components/safe_browsing/core/common/proto:realtimeapi_proto",
       "//components/signin/core/browser",
@@ -752,12 +782,10 @@ source_set("extensions") {
       "//chrome:extra_resources",
       "//chrome:resources",
       "//chrome:strings",
-      "//chrome/app:command_ids",
       "//chrome/app/resources:platform_locale_settings",
       "//chrome/app/theme:chrome_unscaled_resources",
       "//chrome/app/theme:theme_resources",
       "//chrome/app/vector_icons",
-      "//chrome/browser:browser_process",
       "//chrome/browser:font_pref",
       "//chrome/browser:primitives",
       "//chrome/browser:shell_integration",
@@ -767,10 +795,8 @@ source_set("extensions") {
       "//chrome/browser/feedback",
       "//chrome/browser/importer",
       "//chrome/browser/picture_in_picture",
-      "//chrome/browser/prefetch",
       "//chrome/browser/prefs",
       "//chrome/browser/prefs:util",
-      "//chrome/browser/preloading:prefs",
       "//chrome/browser/profiles:profile_util",
       "//chrome/browser/reading_list",
       "//chrome/browser/search",
@@ -798,12 +824,8 @@ source_set("extensions") {
       # Only for allow_circular_includes_from
       "//chrome/browser/apps/app_service/app_icon",
       "//chrome/browser/autofill",
-      "//chrome/browser/bitmap_fetcher",
       "//chrome/browser/browsing_data:constants",
       "//chrome/browser/devtools",
-      "//chrome/browser/extensions:cws_item_service_proto",
-      "//chrome/browser/favicon",
-      "//chrome/browser/google",
       "//chrome/browser/image_decoder",
       "//chrome/browser/media/router",
       "//chrome/browser/media/router:media_router_feature",
@@ -811,7 +833,6 @@ source_set("extensions") {
       "//chrome/browser/profiles",
       "//chrome/browser/profiles:profile",
       "//chrome/browser/resource_coordinator:mojo_bindings",
-      "//chrome/browser/safe_browsing",
       "//chrome/browser/safe_browsing:metrics_collector",
       "//chrome/browser/ui/safety_hub",
       "//chrome/browser/ui/tabs:tab_enums",
@@ -835,7 +856,6 @@ source_set("extensions") {
       # TODO(crbug.com/346472679): Remove this dependency:
       "//chrome/browser/web_applications/extensions",
       "//chrome/common/extensions/api:extensions_features",
-      "//chrome/common/safe_browsing:proto",
       "//chrome/services/file_util/public/mojom:mojom",
       "//chrome/services/removable_storage_writer/public/mojom",
       "//components/affiliations/core/browser:affiliations",
@@ -843,8 +863,6 @@ source_set("extensions") {
       "//components/autofill/content/browser",
       "//components/autofill/core/common:credit_card_number_validation",
       "//components/back_forward_cache",
-      "//components/bookmarks/browser",
-      "//components/bookmarks/managed",
       "//components/browser_sync",
       "//components/browsing_data/content",
       "//components/browsing_data/core",
@@ -856,7 +874,6 @@ source_set("extensions") {
       "//components/download/content/public",
       "//components/download/public/common:public",
       "//components/drive",
-      "//components/embedder_support",
       "//components/embedder_support:browser_util",
       "//components/enterprise",
       "//components/enterprise/buildflags",
@@ -868,8 +885,6 @@ source_set("extensions") {
       "//components/guest_view/common:mojom",
       "//components/history/core/browser",
       "//components/history/core/common",
-      "//components/infobars/content",
-      "//components/infobars/core",
       "//components/javascript_dialogs",
       "//components/keyed_service/content",
       "//components/language/core/browser",
@@ -894,26 +909,17 @@ source_set("extensions") {
       "//components/permissions",
       "//components/policy:generated",
       "//components/policy/core/browser",
-      "//components/privacy_sandbox:features",
-      "//components/privacy_sandbox:privacy_sandbox_prefs",
-      "//components/privacy_sandbox:tracking_protection_prefs",
-      "//components/proxy_config",
       "//components/reading_list/core",
       "//components/resources",
       "//components/safe_browsing:buildflags",
       "//components/safe_browsing/content/browser/web_ui:web_ui",
       "//components/safe_browsing/core/browser/db:database_manager",
-      "//components/safe_browsing/core/common",
-      "//components/safe_browsing/core/common:safe_browsing_prefs",
       "//components/safe_browsing/core/common/proto:csd_proto",
       "//components/search_engines",
       "//components/services/app_service",
-      "//components/services/patch/content",
-      "//components/services/unzip/content",
       "//components/services/unzip/public/cpp",
       "//components/sessions",
       "//components/signin/public/identity_manager",
-      "//components/spellcheck/browser",
       "//components/storage_monitor",
       "//components/strings",
       "//components/sync",
@@ -925,11 +931,8 @@ source_set("extensions") {
       "//components/translate/core/common",
       "//components/undo",
       "//components/unified_consent",
-      "//components/update_client",
-      "//components/update_client:common_impl",
       "//components/url_formatter",
       "//components/url_matcher",
-      "//components/user_prefs",
       "//components/vector_icons",
       "//components/web_modal",
       "//components/zoom",
@@ -940,7 +943,6 @@ source_set("extensions") {
       "//extensions:extensions_resources",
       "//extensions/browser/api/content_settings:content_settings",
       "//extensions/browser/api/storage:settings_namespace",
-      "//extensions/browser/api/storage:settings_observer",
       "//extensions/browser/api/system_display:display_info_provider",
       "//extensions/browser/api/virtual_keyboard_private:virtual_keyboard_delegate",
       "//extensions/browser/updater:keepalive",
@@ -948,7 +950,6 @@ source_set("extensions") {
       "//extensions/common/api",
       "//extensions/strings",
       "//google_apis",
-      "//google_apis/common:request_util",
       "//media:media_buildflags",
       "//net:extras",
       "//pdf:buildflags",
@@ -974,7 +975,6 @@ source_set("extensions") {
       "//third_party/libaddressinput:util",
       "//third_party/re2",
       "//third_party/zlib/google:compression_utils",
-      "//third_party/zlib/google:zip",
       "//ui/accessibility:ax_enums_mojo",
       "//ui/base",
       "//ui/base:ozone_buildflags",
@@ -1462,7 +1462,7 @@ source_set("extensions") {
   }  # if (enable_extensions)
 }
 
-if (enable_extensions) {
+if (enable_extensions_core) {
   proto_library("cws_item_service_proto") {
     sources = [ "cws_item_service.proto" ]
   }

chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc

@@ -17,7 +17,7 @@
 #include "chrome/browser/extensions/api/autofill_private/autofill_private_event_router_factory.h"
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmarks_api.h"
-#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"
+#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"  // nogncheck
 #include "chrome/browser/extensions/api/braille_display_private/braille_display_private_api.h"
 #include "chrome/browser/extensions/api/developer_private/developer_private_api.h"
 #include "chrome/browser/extensions/api/font_settings/font_settings_api.h"

chrome/browser/sync/glue/extensions_activity_monitor.cc

@@ -8,7 +8,7 @@
 #include "content/public/browser/browser_thread.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"
+#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"  // nogncheck
 #include "extensions/browser/extension_function.h"  // nogncheck
 #include "extensions/browser/extension_function_histogram_value.h"
 #endif

chrome/browser/sync/glue/extensions_activity_monitor.h

@@ -11,7 +11,7 @@
 #include "extensions/buildflags/buildflags.h"
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"
+#include "chrome/browser/extensions/api/bookmarks/bookmarks_api_watcher.h"  // nogncheck
 
 class ExtensionFunction;
 #endif

chrome/common/chrome_features.cc

@@ -910,7 +910,7 @@ BASE_FEATURE(kOfflineAutoFetch,
              base::FEATURE_ENABLED_BY_DEFAULT);
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 BASE_FEATURE(kOnConnectNative,
              "OnConnectNative",
              base::FEATURE_DISABLED_BY_DEFAULT);

chrome/common/chrome_features.h

@@ -534,7 +534,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
 BASE_DECLARE_FEATURE(kOfflineAutoFetch);
 #endif  // BUILDFLAG(IS_ANDROID)
 
-#if !BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
 COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kOnConnectNative);
 #endif
 

chrome/common/pref_names.h

@@ -3500,6 +3500,11 @@ inline constexpr char kCryptAuthInstanceIdToken[] =
 inline constexpr char kRecoveryComponentNeedsElevation[] =
     "recovery_component.needs_elevation";
 
+#if BUILDFLAG(ENABLE_EXTENSIONS_CORE)
+// Policy that indicates how to handle animated images.
+inline constexpr char kAnimationPolicy[] = "settings.a11y.animation_policy";
+#endif
+
 #if BUILDFLAG(ENABLE_EXTENSIONS)
 // Boolean that indicates whether Chrome enterprise extension request is enabled
 // or not.
@@ -3512,9 +3517,6 @@ inline constexpr char kCloudExtensionRequestEnabled[] =
 inline constexpr char kCloudExtensionRequestIds[] =
     "enterprise_reporting.extension_request.ids";
 
-// Policy that indicates how to handle animated images.
-inline constexpr char kAnimationPolicy[] = "settings.a11y.animation_policy";
-
 // A list of URLs (for U2F) or domains (for webauthn) that automatically permit
 // direct attestation of a Security Key.
 inline constexpr char kSecurityKeyPermitAttestation[] =