Move the creation of ChromeOS specific factories to separate file

Bug: 1021488
Change-Id: Ie44dd08048ad75222602d4dbbfbc0a7807d17bf3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865339
Commit-Queue: Nikita Podguzov <nikitapodguzov@chromium.org>
Reviewed-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Cr-Commit-Position: refs/heads/master@{#713110}

chrome/browser/chromeos/BUILD.gn

@@ -723,6 +723,8 @@ source_set("chromeos") {
     "bluetooth/debug_logs_manager_factory.h",
     "boot_times_recorder.cc",
     "boot_times_recorder.h",
+    "browser_context_keyed_service_factories.cc",
+    "browser_context_keyed_service_factories.h",
     "camera_detector.cc",
     "camera_detector.h",
     "camera_presence_notifier.cc",

chrome/browser/chromeos/browser_context_keyed_service_factories.cc

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/browser/chromeos/browser_context_keyed_service_factories.h"
+
+#include "chrome/browser/chromeos/account_manager/account_manager_migrator.h"
+#include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h"
+#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
+#include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
+#include "chrome/browser/chromeos/crostini/crostini_registry_service_factory.h"
+#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
+#include "chrome/browser/chromeos/extensions/input_method_api.h"
+#include "chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h"
+#include "chrome/browser/chromeos/extensions/media_player_api.h"
+#include "chrome/browser/chromeos/extensions/printing/printing_api_handler.h"
+#include "chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h"
+#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service_factory.h"
+#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
+#include "chrome/browser/chromeos/plugin_vm/plugin_vm_engagement_metrics_service.h"
+#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
+#include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h"
+#include "chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h"
+#include "chrome/browser/chromeos/printing/cups_print_job_manager_factory.h"
+#include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
+#include "chrome/browser/chromeos/printing/cups_proxy_service_manager_factory.h"
+#include "chrome/browser/chromeos/printing/history/print_job_history_service_factory.h"
+#include "chrome/browser/chromeos/printing/synced_printers_manager_factory.h"
+#include "chrome/browser/chromeos/smb_client/smb_service_factory.h"
+#include "chrome/browser/chromeos/tether/tether_service_factory.h"
+#include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
+#include "extensions/browser/api/clipboard/clipboard_api.h"
+#include "extensions/browser/api/networking_config/networking_config_service_factory.h"
+#include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h"
+#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
+#include "extensions/browser/api/webcam_private/webcam_private_api.h"
+
+namespace chromeos {
+
+void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
+  AccountManagerMigratorFactory::GetInstance();
+  android_sms::AndroidSmsServiceFactory::GetInstance();
+  arc::ArcAccessibilityHelperBridge::CreateFactory();
+  bluetooth::DebugLogsManagerFactory::GetInstance();
+  crostini::CrostiniRegistryServiceFactory::GetInstance();
+  CupsPrintJobManagerFactory::GetInstance();
+  CupsPrintersManagerFactory::GetInstance();
+#if defined(USE_CUPS)
+  CupsProxyServiceManagerFactory::GetInstance();
+#endif
+  EasyUnlockServiceFactory::GetInstance();
+
+  extensions::ClipboardAPI::GetFactoryInstance();
+  extensions::InputMethodAPI::GetFactoryInstance();
+  extensions::MediaPlayerAPI::GetFactoryInstance();
+  extensions::NetworkingConfigServiceFactory::GetInstance();
+  extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
+  extensions::PrintingAPIHandler::GetFactoryInstance();
+  extensions::PrintJobFinishedEventDispatcher::GetFactoryInstance();
+  extensions::VerifyTrustAPI::GetFactoryInstance();
+  extensions::VirtualKeyboardAPI::GetFactoryInstance();
+  extensions::WebcamPrivateAPI::GetFactoryInstance();
+  file_manager::EventRouterFactory::GetInstance();
+  OwnerSettingsServiceChromeOSFactory::GetInstance();
+  plugin_vm::PluginVmEngagementMetricsService::Factory::GetInstance();
+  policy::PolicyCertServiceFactory::GetInstance();
+  policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
+  policy::UserNetworkConfigurationUpdaterFactory::GetInstance();
+  PrintJobHistoryServiceFactory::GetInstance();
+  smb_client::SmbServiceFactory::GetInstance();
+  SyncedPrintersManagerFactory::GetInstance();
+  TetherServiceFactory::GetInstance();
+  VpnServiceFactory::GetInstance();
+}
+
+}  // namespace chromeos

chrome/browser/chromeos/browser_context_keyed_service_factories.h

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CHROME_BROWSER_CHROMEOS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
+#define CHROME_BROWSER_CHROMEOS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_
+
+namespace chromeos {
+
+// Ensures the existence of any BrowserContextKeyedServiceFactory provided by
+// the Chrome OS code.
+void EnsureBrowserContextKeyedServiceFactoriesBuilt();
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_BROWSER_CONTEXT_KEYED_SERVICE_FACTORIES_H_

chrome/browser/extensions/browser_context_keyed_service_factories.cc

@@ -20,6 +20,7 @@
 #include "chrome/browser/extensions/api/history/history_api.h"
 #include "chrome/browser/extensions/api/identity/identity_api.h"
 #include "chrome/browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h"
+#include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h"
 #include "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 #include "chrome/browser/extensions/api/passwords_private/passwords_private_event_router_factory.h"
 #include "chrome/browser/extensions/api/preference/preference_api.h"
@@ -48,14 +49,10 @@
 #include "chrome/common/buildflags.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
+#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
 #include "ppapi/buildflags/buildflags.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/file_manager/event_router_factory.h"
-#include "chrome/browser/chromeos/extensions/input_method_api.h"
-#include "chrome/browser/chromeos/extensions/media_player_api.h"
-#include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #endif
 
@@ -91,20 +88,20 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::IdentityAPI::GetFactoryInstance();
   extensions::InstallTrackerFactory::GetInstance();
   extensions::InstallVerifierFactory::GetInstance();
-#if defined(OS_CHROMEOS)
-  extensions::InputImeAPI::GetFactoryInstance();
-  extensions::InputMethodAPI::GetFactoryInstance();
-#elif defined(OS_LINUX) || defined(OS_WIN)
+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
   extensions::InputImeAPI::GetFactoryInstance();
 #endif
   extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();
 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
   extensions::MDnsAPI::GetFactoryInstance();
-#endif
-#if defined(OS_CHROMEOS)
-  extensions::MediaPlayerAPI::GetFactoryInstance();
 #endif
   extensions::MenuManagerFactory::GetInstance();
+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
+  auto networking_private_ui_delegate_factory =
+      std::make_unique<extensions::NetworkingPrivateUIDelegateFactoryImpl>();
+  extensions::NetworkingPrivateDelegateFactory::GetInstance()
+      ->SetUIDelegateFactory(std::move(networking_private_ui_delegate_factory));
+#endif
   extensions::OmniboxAPI::GetFactoryInstance();
   extensions::PasswordsPrivateEventRouterFactory::GetInstance();
 #if BUILDFLAG(ENABLE_PLUGINS)
@@ -126,9 +123,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::WarningBadgeServiceFactory::GetInstance();
   extensions::WebNavigationAPI::GetFactoryInstance();
   extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  file_manager::EventRouterFactory::GetInstance();
-#endif
   ToolbarActionsModelFactory::GetInstance();
   extensions::ExtensionGCMAppHandler::GetFactoryInstance();
 }

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -17,7 +17,6 @@
 #include "chrome/browser/browsing_data/browsing_data_history_observer_service.h"
 #include "chrome/browser/browsing_data/chrome_browsing_data_remover_delegate_factory.h"
 #include "chrome/browser/chrome_browser_main.h"
-#include "chrome/browser/chromeos/account_manager/account_manager_migrator.h"
 #include "chrome/browser/client_hints/client_hints_factory.h"
 #include "chrome/browser/consent_auditor/consent_auditor_factory.h"
 #include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -109,26 +108,7 @@
 #endif
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/android_sms/android_sms_service_factory.h"
-#include "chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge.h"
-#include "chrome/browser/chromeos/bluetooth/debug_logs_manager_factory.h"
-#include "chrome/browser/chromeos/crostini/crostini_registry_service_factory.h"
-#include "chrome/browser/chromeos/extensions/login_screen/login_state/session_state_changed_event_dispatcher.h"
-#include "chrome/browser/chromeos/extensions/printing/printing_api_handler.h"
-#include "chrome/browser/chromeos/extensions/printing_metrics/print_job_finished_event_dispatcher.h"
-#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
-#include "chrome/browser/chromeos/plugin_vm/plugin_vm_engagement_metrics_service.h"
-#include "chrome/browser/chromeos/policy/policy_cert_service_factory.h"
-#include "chrome/browser/chromeos/policy/user_cloud_policy_token_forwarder_factory.h"
-#include "chrome/browser/chromeos/policy/user_network_configuration_updater_factory.h"
-#include "chrome/browser/chromeos/printing/cups_print_job_manager_factory.h"
-#include "chrome/browser/chromeos/printing/cups_printers_manager_factory.h"
-#include "chrome/browser/chromeos/printing/cups_proxy_service_manager_factory.h"
-#include "chrome/browser/chromeos/printing/history/print_job_history_service_factory.h"
-#include "chrome/browser/chromeos/printing/synced_printers_manager_factory.h"
-#include "chrome/browser/chromeos/smb_client/smb_service_factory.h"
-#include "chrome/browser/chromeos/tether/tether_service_factory.h"
-#include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
+#include "chrome/browser/chromeos/browser_context_keyed_service_factories.h"
 #else
 #include "chrome/browser/policy/cloud/user_policy_signin_service_factory.h"
 #endif
@@ -151,16 +131,11 @@
 #include "apps/browser_context_keyed_service_factories.h"
 #include "chrome/browser/apps/platform_apps/api/browser_context_keyed_service_factories.h"
 #include "chrome/browser/apps/platform_apps/browser_context_keyed_service_factories.h"
-#include "chrome/browser/extensions/api/networking_private/networking_private_ui_delegate_factory_impl.h"
 #include "chrome/browser/extensions/browser_context_keyed_service_factories.h"
 #include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/ui/web_applications/web_app_metrics_factory.h"
 #include "chrome/browser/web_applications/web_app_provider_factory.h"
-#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
 #include "extensions/browser/browser_context_keyed_service_factories.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_service_factory.h"
-#endif
 #endif
 
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
@@ -225,6 +200,10 @@ void ChromeBrowserMainExtraPartsProfiles::
   chrome_apps::api::EnsureAPIBrowserContextKeyedServiceFactoriesBuilt();
 #endif
 
+#if defined(OS_CHROMEOS)
+  chromeos::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+#endif
+
 #if BUILDFLAG(ENABLE_APP_LIST)
   app_list::AppListSyncableServiceFactory::GetInstance();
 #endif
@@ -238,9 +217,6 @@ void ChromeBrowserMainExtraPartsProfiles::
   AccountConsistencyModeManagerFactory::GetInstance();
   AccountInvestigatorFactory::GetInstance();
   AccountReconcilorFactory::GetInstance();
-#if defined(OS_CHROMEOS)
-  arc::ArcAccessibilityHelperBridge::CreateFactory();
-#endif
   AutocompleteClassifierFactory::GetInstance();
   autofill::PersonalDataManagerFactory::GetInstance();
 #if BUILDFLAG(ENABLE_BACKGROUND_CONTENTS)
@@ -255,9 +231,6 @@ void ChromeBrowserMainExtraPartsProfiles::
 #endif
   CertificateReportingServiceFactory::GetInstance();
   ChromeBrowsingDataRemoverDelegateFactory::GetInstance();
-#if defined(OS_CHROMEOS)
-  chromeos::android_sms::AndroidSmsServiceFactory::GetInstance();
-#endif
   ChromeSigninClientFactory::GetInstance();
   ClientHintsFactory::GetInstance();
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
@@ -270,31 +243,8 @@ void ChromeBrowserMainExtraPartsProfiles::
   dom_distiller::DomDistillerServiceFactory::GetInstance();
   DownloadCoreServiceFactory::GetInstance();
   DownloadServiceFactory::GetInstance();
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-#if defined(OS_CHROMEOS)
-  chromeos::EasyUnlockServiceFactory::GetInstance();
-#endif
-#endif
 #if defined(OS_ANDROID)
   explore_sites::ExploreSitesServiceFactory::GetInstance();
-#endif
-#if defined(OS_CHROMEOS)
-  chromeos::AccountManagerMigratorFactory::GetInstance();
-  chromeos::bluetooth::DebugLogsManagerFactory::GetInstance();
-  chromeos::CupsPrintJobManagerFactory::GetInstance();
-  chromeos::CupsPrintersManagerFactory::GetInstance();
-  chromeos::PrintJobHistoryServiceFactory::GetInstance();
-  chromeos::SyncedPrintersManagerFactory::GetInstance();
-  chromeos::smb_client::SmbServiceFactory::GetInstance();
-  crostini::CrostiniRegistryServiceFactory::GetInstance();
-  extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
-  extensions::PrintingAPIHandler::GetFactoryInstance();
-  extensions::PrintJobFinishedEventDispatcher::GetFactoryInstance();
-  extensions::VerifyTrustAPI::GetFactoryInstance();
-  TetherServiceFactory::GetInstance();
-#if defined(USE_CUPS)
-  chromeos::CupsProxyServiceManagerFactory::GetInstance();
-#endif
 #endif
   FaviconServiceFactory::GetInstance();
   HistoryUiFaviconRequestHandlerFactory::GetInstance();
@@ -327,15 +277,6 @@ void ChromeBrowserMainExtraPartsProfiles::
   RendererUpdaterFactory::GetInstance();
 #if BUILDFLAG(ENABLE_SUPERVISED_USERS)
   SupervisedUserServiceFactory::GetInstance();
-#endif
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_MACOSX)
-  std::unique_ptr<extensions::NetworkingPrivateUIDelegateFactoryImpl>
-      networking_private_ui_delegate_factory(
-          new extensions::NetworkingPrivateUIDelegateFactoryImpl);
-  extensions::NetworkingPrivateDelegateFactory::GetInstance()
-      ->SetUIDelegateFactory(std::move(networking_private_ui_delegate_factory));
-#endif
 #endif
   LanguageModelManagerFactory::GetInstance();
 #if !defined(OS_ANDROID)
@@ -368,17 +309,9 @@ void ChromeBrowserMainExtraPartsProfiles::
 #endif
 #if BUILDFLAG(ENABLE_PLUGINS)
   PluginPrefsFactory::GetInstance();
-#endif
-#if defined(OS_CHROMEOS)
-  plugin_vm::PluginVmEngagementMetricsService::Factory::GetInstance();
 #endif
   PrefsTabHelper::GetServiceInstance();
-#if defined(OS_CHROMEOS)
-  chromeos::OwnerSettingsServiceChromeOSFactory::GetInstance();
-  policy::PolicyCertServiceFactory::GetInstance();
-  policy::UserCloudPolicyTokenForwarderFactory::GetInstance();
-  policy::UserNetworkConfigurationUpdaterFactory::GetInstance();
-#else  // !defined(OS_CHROMEOS)
+#if !defined(OS_CHROMEOS)
   policy::UserPolicySigninServiceFactory::GetInstance();
 #endif
   policy::UserCloudPolicyInvalidatorFactory::GetInstance();

extensions/browser/browser_context_keyed_service_factories.cc

@@ -12,14 +12,12 @@
 #include "extensions/browser/api/bluetooth/bluetooth_private_api.h"
 #include "extensions/browser/api/bluetooth_socket/bluetooth_socket_event_dispatcher.h"
 #include "extensions/browser/api/cast_channel/cast_channel_api.h"
-#include "extensions/browser/api/clipboard/clipboard_api.h"
 #include "extensions/browser/api/declarative_net_request/rules_monitor_service.h"
 #include "extensions/browser/api/display_source/display_source_event_router_factory.h"
 #include "extensions/browser/api/feedback_private/feedback_private_api.h"
 #include "extensions/browser/api/hid/hid_device_manager.h"
 #include "extensions/browser/api/idle/idle_manager_factory.h"
 #include "extensions/browser/api/management/management_api.h"
-#include "extensions/browser/api/networking_config/networking_config_service_factory.h"
 #include "extensions/browser/api/networking_private/networking_private_event_router_factory.h"
 #include "extensions/browser/api/power/power_api.h"
 #include "extensions/browser/api/runtime/runtime_api.h"
@@ -32,11 +30,12 @@
 #include "extensions/browser/api/sockets_udp/udp_socket_event_dispatcher.h"
 #include "extensions/browser/api/storage/storage_frontend.h"
 #include "extensions/browser/api/system_info/system_info_api.h"
+#if defined(OS_CHROMEOS)
+#include "extensions/browser/api/system_power_source/system_power_source_api.h"
+#endif
 #include "extensions/browser/api/usb/usb_device_manager.h"
 #include "extensions/browser/api/usb/usb_device_resource.h"
-#include "extensions/browser/api/virtual_keyboard_private/virtual_keyboard_private_api.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
-#include "extensions/browser/api/webcam_private/webcam_private_api.h"
 #include "extensions/browser/declarative_user_script_manager_factory.h"
 #include "extensions/browser/event_router_factory.h"
 #include "extensions/browser/extension_message_filter.h"
@@ -44,11 +43,6 @@
 #include "extensions/browser/process_manager_factory.h"
 #include "extensions/browser/renderer_startup_helper.h"
 
-#if defined(OS_CHROMEOS)
-#include "extensions/browser/api/system_power_source/system_power_source_api.h"
-#include "extensions/browser/api/vpn_provider/vpn_service_factory.h"
-#endif  // defined(OS_CHROMEOS)
-
 namespace extensions {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
@@ -63,10 +57,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   BluetoothAPI::GetFactoryInstance();
   BluetoothPrivateAPI::GetFactoryInstance();
   CastChannelAPI::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  ClipboardAPI::GetFactoryInstance();
-  chromeos::VpnServiceFactory::GetInstance();
-#endif
   api::BluetoothSocketEventDispatcher::GetFactoryInstance();
   api::TCPServerSocketEventDispatcher::GetFactoryInstance();
   api::TCPSocketEventDispatcher::GetFactoryInstance();
@@ -81,9 +71,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   HidDeviceManager::GetFactoryInstance();
   IdleManagerFactory::GetInstance();
   ManagementAPI::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  NetworkingConfigServiceFactory::GetInstance();
-#endif
 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
   NetworkingPrivateEventRouterFactory::GetInstance();
 #endif
@@ -94,13 +81,11 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   StorageFrontend::GetFactoryInstance();
   SystemInfoAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
+  // TODO(devlin): Remove dependency on ShellApiTest and move this call out to
+  // chrome/browser/chromeos/browser_context_keyed_service_factories.cc.
   SystemPowerSourceAPI::GetFactoryInstance();
 #endif
   UsbDeviceManager::GetFactoryInstance();
-#if defined(OS_CHROMEOS)
-  VirtualKeyboardAPI::GetFactoryInstance();
-  WebcamPrivateAPI::GetFactoryInstance();
-#endif
   WebRequestAPI::GetFactoryInstance();
 }