BCKSF cleanup part 2.

Move calls to the files that best match the directories the factories
live in.  In most cases this has little practical effect; see per-file
comments for the exceptions.

Bug: none
Change-Id: If634e455c68f80361536243382ea9362d84181a7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134926
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756100}

apps/browser_context_keyed_service_factories.cc

@@ -9,13 +9,11 @@
 #include "apps/saved_files_service.h"
 #include "apps/saved_files_service_factory.h"
 #include "content/public/browser/browser_context.h"
-#include "extensions/browser/app_window/app_window_geometry_cache.h"
 
 namespace apps {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  apps::AppRestoreServiceFactory::GetInstance();
-  extensions::AppWindowGeometryCache::Factory::GetInstance();
+  AppRestoreServiceFactory::GetInstance();
 }
 
 void NotifyApplicationTerminating(content::BrowserContext* browser_context) {

chrome/browser/apps/platform_apps/browser_context_keyed_service_factories.cc

@@ -4,7 +4,6 @@
 
 #include "chrome/browser/apps/platform_apps/browser_context_keyed_service_factories.h"
 
-#include "apps/browser_context_keyed_service_factories.h"
 #include "chrome/browser/apps/platform_apps/app_load_service_factory.h"
 #include "chrome/browser/apps/platform_apps/app_termination_observer.h"
 #include "chrome/browser/apps/platform_apps/shortcut_manager_factory.h"
@@ -12,8 +11,6 @@
 namespace chrome_apps {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-
   apps::AppLoadServiceFactory::GetInstance();
   AppShortcutManagerFactory::GetInstance();
   AppTerminationObserver::GetFactoryInstance();

chrome/browser/chromeos/browser_context_keyed_service_factories.cc

@@ -27,13 +27,6 @@
 #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/extensions/api/terminal/terminal_private_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"
 
 #if defined(USE_CUPS)
 #include "chrome/browser/chromeos/extensions/printing/printing_api_handler.h"
@@ -53,19 +46,13 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   CupsPrintersManagerFactory::GetInstance();
   CupsPrintJobManagerFactory::GetInstance();
   EasyUnlockServiceFactory::GetInstance();
-  extensions::ClipboardAPI::GetFactoryInstance();
   extensions::InputMethodAPI::GetFactoryInstance();
   extensions::MediaPlayerAPI::GetFactoryInstance();
-  extensions::NetworkingConfigServiceFactory::GetInstance();
 #if defined(USE_CUPS)
   extensions::PrintingAPIHandler::GetFactoryInstance();
 #endif
   extensions::PrintJobFinishedEventDispatcher::GetFactoryInstance();
   extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
-  extensions::TerminalPrivateAPI::GetFactoryInstance();
-  extensions::VerifyTrustAPI::GetFactoryInstance();
-  extensions::VirtualKeyboardAPI::GetFactoryInstance();
-  extensions::WebcamPrivateAPI::GetFactoryInstance();
   file_manager::EventRouterFactory::GetInstance();
   guest_os::GuestOsRegistryServiceFactory::GetInstance();
   KerberosCredentialsManagerFactory::GetInstance();
@@ -78,7 +65,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   smb_client::SmbServiceFactory::GetInstance();
   SyncedPrintersManagerFactory::GetInstance();
   TetherServiceFactory::GetInstance();
-  VpnServiceFactory::GetInstance();
 }
 
 }  // namespace chromeos

chrome/browser/extensions/browser_context_keyed_service_factories.cc

@@ -38,6 +38,7 @@
 #include "chrome/browser/extensions/chrome_extension_cookies_factory.h"
 #include "chrome/browser/extensions/extension_garbage_collector_factory.h"
 #include "chrome/browser/extensions/extension_gcm_app_handler.h"
+#include "chrome/browser/extensions/extension_management.h"
 #include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
@@ -46,7 +47,6 @@
 #include "chrome/browser/extensions/plugin_manager.h"
 #include "chrome/browser/extensions/warning_badge_service_factory.h"
 #include "chrome/browser/speech/extension_api/tts_extension_api.h"
-#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
 #include "chrome/common/buildflags.h"
 #include "components/spellcheck/spellcheck_buildflags.h"
 #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
@@ -57,6 +57,11 @@
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/extensions/api/platform_keys/verify_trust_api.h"
+#include "chrome/browser/extensions/api/terminal/terminal_private_api.h"
+#endif
+
 #if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
 #include "chrome/browser/extensions/api/mdns/mdns_api.h"
 #endif
@@ -90,6 +95,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::ExtensionActionAPI::GetFactoryInstance();
   extensions::ExtensionGarbageCollectorFactory::GetInstance();
   extensions::ExtensionGCMAppHandler::GetFactoryInstance();
+  extensions::ExtensionManagementFactory::GetInstance();
   extensions::ExtensionSystemFactory::GetInstance();
   extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
   extensions::FontSettingsAPI::GetFactoryInstance();
@@ -129,11 +135,16 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::SystemIndicatorManagerFactory::GetInstance();
   extensions::TabCaptureRegistry::GetFactoryInstance();
   extensions::TabsWindowsAPI::GetFactoryInstance();
+#if defined(OS_CHROMEOS)
+  extensions::TerminalPrivateAPI::GetFactoryInstance();
+#endif
   extensions::TtsAPI::GetFactoryInstance();
+#if defined(OS_CHROMEOS)
+  extensions::VerifyTrustAPI::GetFactoryInstance();
+#endif
   extensions::WarningBadgeServiceFactory::GetInstance();
   extensions::WebNavigationAPI::GetFactoryInstance();
   extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
-  ToolbarActionsModelFactory::GetInstance();
 }
 
 }  // namespace chrome_extensions

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -81,6 +81,7 @@
 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h"
 #include "chrome/browser/ui/prefs/prefs_tab_helper.h"
 #include "chrome/browser/ui/tabs/pinned_tab_service_factory.h"
+#include "chrome/browser/ui/toolbar/toolbar_actions_model_factory.h"
 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache_factory.h"
 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
 #include "chrome/browser/undo/bookmark_undo_service_factory.h"
@@ -137,7 +138,6 @@
 #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/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/browser_context_keyed_service_factories.h"
@@ -245,9 +245,6 @@ void ChromeBrowserMainExtraPartsProfiles::
   DownloadServiceFactory::GetInstance();
 #if defined(OS_ANDROID)
   explore_sites::ExploreSitesServiceFactory::GetInstance();
-#endif
-#if BUILDFLAG(ENABLE_EXTENSIONS)
-  extensions::ExtensionManagementFactory::GetInstance();
 #endif
   FaviconServiceFactory::GetInstance();
 #if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
@@ -354,6 +351,9 @@ void ChromeBrowserMainExtraPartsProfiles::
   TemplateURLServiceFactory::GetInstance();
 #if !defined(OS_ANDROID)
   ThemeServiceFactory::GetInstance();
+#endif
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  ToolbarActionsModelFactory::GetInstance();
 #endif
   TopSitesFactory::GetInstance();
   translate::TranslateRankerFactory::GetInstance();

extensions/browser/browser_context_keyed_service_factories.cc

@@ -33,15 +33,22 @@
 #include "extensions/browser/api/usb/usb_device_manager.h"
 #include "extensions/browser/api/usb/usb_device_resource.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
+#include "extensions/browser/app_window/app_window_geometry_cache.h"
 #include "extensions/browser/declarative_user_script_manager_factory.h"
 #include "extensions/browser/event_router_factory.h"
 #include "extensions/browser/extension_message_filter.h"
 #include "extensions/browser/extension_prefs_factory.h"
 #include "extensions/browser/process_manager_factory.h"
 #include "extensions/browser/renderer_startup_helper.h"
+#include "extensions/browser/updater/update_service_factory.h"
 
 #if defined(OS_CHROMEOS)
+#include "extensions/browser/api/clipboard/clipboard_api.h"
+#include "extensions/browser/api/networking_config/networking_config_service_factory.h"
 #include "extensions/browser/api/system_power_source/system_power_source_api.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"
 #endif
 
 namespace extensions {
@@ -54,10 +61,14 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   ApiResourceManager<SerialConnection>::GetFactoryInstance();
   ApiResourceManager<Socket>::GetFactoryInstance();
   ApiResourceManager<UsbDeviceResource>::GetFactoryInstance();
+  AppWindowGeometryCache::Factory::GetInstance();
   AudioAPI::GetFactoryInstance();
   BluetoothAPI::GetFactoryInstance();
   BluetoothPrivateAPI::GetFactoryInstance();
   CastChannelAPI::GetFactoryInstance();
+#if defined(OS_CHROMEOS)
+  ClipboardAPI::GetFactoryInstance();
+#endif
   api::BluetoothSocketEventDispatcher::GetFactoryInstance();
   api::TCPServerSocketEventDispatcher::GetFactoryInstance();
   api::TCPSocketEventDispatcher::GetFactoryInstance();
@@ -72,6 +83,9 @@ 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
@@ -84,7 +98,13 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(OS_CHROMEOS)
   SystemPowerSourceAPI::GetFactoryInstance();
 #endif
+  UpdateServiceFactory::GetInstance();
   UsbDeviceManager::GetFactoryInstance();
+#if defined(OS_CHROMEOS)
+  VirtualKeyboardAPI::GetFactoryInstance();
+  chromeos::VpnServiceFactory::GetInstance();
+  WebcamPrivateAPI::GetFactoryInstance();
+#endif
   WebRequestAPI::GetFactoryInstance();
 }
 

extensions/shell/browser/shell_browser_context_keyed_service_factories.cc

@@ -4,7 +4,6 @@
 
 #include "extensions/shell/browser/shell_browser_context_keyed_service_factories.h"
 
-#include "extensions/browser/updater/update_service_factory.h"
 #include "extensions/shell/browser/shell_extension_system_factory.h"
 
 namespace extensions {
@@ -12,7 +11,6 @@ namespace shell {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   ShellExtensionSystemFactory::GetInstance();
-  UpdateServiceFactory::GetInstance();
 }
 
 }  // namespace shell