BCKSF cleanup part 1.

* Put calls to other "ensure factories built" metafunctions before
  calls to build specific factories.
* Name all the metafunctions
  EnsureBrowserContextKeyedServiceFactoriesBuilt().
* Alphabetize.
* Remove unnecessary blank lines.
* Remove no-longer-applicable comments.

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

chrome/browser/apps/platform_apps/api/browser_context_keyed_service_factories.cc

@@ -11,7 +11,7 @@
 namespace chrome_apps {
 namespace api {
 
-void EnsureAPIBrowserContextKeyedServiceFactoriesBuilt() {
+void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if defined(OS_CHROMEOS)
   ArcAppsPrivateAPI::GetFactoryInstance();
 #endif

chrome/browser/apps/platform_apps/api/browser_context_keyed_service_factories.h

@@ -10,7 +10,7 @@ namespace api {
 
 // Ensures the existence of any BrowserContextKeyedServiceFactory provided by
 // the Chrome Apps API code.
-void EnsureAPIBrowserContextKeyedServiceFactoriesBuilt();
+void EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
 }  // namespace api
 }  // namespace chrome_apps

chrome/browser/apps/platform_apps/browser_context_keyed_service_factories.cc

@@ -13,9 +13,10 @@ namespace chrome_apps {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  AppTerminationObserver::GetFactoryInstance();
-  AppShortcutManagerFactory::GetInstance();
+
   apps::AppLoadServiceFactory::GetInstance();
+  AppShortcutManagerFactory::GetInstance();
+  AppTerminationObserver::GetFactoryInstance();
 }
 
 }  // namespace chrome_apps

chrome/browser/chromeos/browser_context_keyed_service_factories.cc

@@ -47,28 +47,27 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   android_sms::AndroidSmsServiceFactory::GetInstance();
   arc::ArcAccessibilityHelperBridge::CreateFactory();
   bluetooth::DebugLogsManagerFactory::GetInstance();
-  guest_os::GuestOsRegistryServiceFactory::GetInstance();
-  CupsPrintJobManagerFactory::GetInstance();
-  CupsPrintersManagerFactory::GetInstance();
 #if defined(USE_CUPS)
   CupsProxyServiceManagerFactory::GetInstance();
 #endif
+  CupsPrintersManagerFactory::GetInstance();
+  CupsPrintJobManagerFactory::GetInstance();
   EasyUnlockServiceFactory::GetInstance();
-
   extensions::ClipboardAPI::GetFactoryInstance();
   extensions::InputMethodAPI::GetFactoryInstance();
   extensions::MediaPlayerAPI::GetFactoryInstance();
   extensions::NetworkingConfigServiceFactory::GetInstance();
-  extensions::SessionStateChangedEventDispatcher::GetFactoryInstance();
 #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();
   OwnerSettingsServiceChromeOSFactory::GetInstance();
   plugin_vm::PluginVmEngagementMetricsService::Factory::GetInstance();

chrome/browser/extensions/browser_context_keyed_service_factories.cc

@@ -89,6 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::DeveloperPrivateAPI::GetFactoryInstance();
   extensions::ExtensionActionAPI::GetFactoryInstance();
   extensions::ExtensionGarbageCollectorFactory::GetInstance();
+  extensions::ExtensionGCMAppHandler::GetFactoryInstance();
   extensions::ExtensionSystemFactory::GetInstance();
   extensions::ExtensionWebUIOverrideRegistrar::GetFactoryInstance();
   extensions::FontSettingsAPI::GetFactoryInstance();
@@ -133,7 +134,6 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::WebNavigationAPI::GetFactoryInstance();
   extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
   ToolbarActionsModelFactory::GetInstance();
-  extensions::ExtensionGCMAppHandler::GetFactoryInstance();
 }
 
 }  // namespace chrome_extensions

chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -194,26 +194,26 @@ void ChromeBrowserMainExtraPartsProfiles::
     EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
   apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  extensions::ExtensionManagementFactory::GetInstance();
-  chrome_extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   chrome_apps::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  chrome_apps::api::EnsureAPIBrowserContextKeyedServiceFactoriesBuilt();
+  chrome_apps::api::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  chrome_extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
+  extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
 #endif
-
 #if defined(OS_CHROMEOS)
   chromeos::EnsureBrowserContextKeyedServiceFactoriesBuilt();
-  app_list::AppListSyncableServiceFactory::GetInstance();
 #endif
 
-#if !defined(OS_ANDROID)
-  apps::AppServiceProxyFactory::GetInstance();
-#endif
   AboutSigninInternalsFactory::GetInstance();
   AccountConsistencyModeManagerFactory::GetInstance();
   AccountInvestigatorFactory::GetInstance();
   AccountReconcilorFactory::GetInstance();
   AdaptiveQuietNotificationPermissionUiEnabler::Factory::GetInstance();
+#if defined(OS_CHROMEOS)
+  app_list::AppListSyncableServiceFactory::GetInstance();
+#endif
+#if !defined(OS_ANDROID)
+  apps::AppServiceProxyFactory::GetInstance();
+#endif
   AutocompleteClassifierFactory::GetInstance();
   autofill::PersonalDataManagerFactory::GetInstance();
 #if BUILDFLAG(ENABLE_BACKGROUND_CONTENTS)
@@ -221,8 +221,8 @@ void ChromeBrowserMainExtraPartsProfiles::
 #endif
   BookmarkModelFactory::GetInstance();
   BookmarkUndoServiceFactory::GetInstance();
-  BrowsingDataHistoryObserverService::Factory::GetInstance();
   browser_sync::UserEventServiceFactory::GetInstance();
+  BrowsingDataHistoryObserverService::Factory::GetInstance();
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
@@ -230,22 +230,26 @@ void ChromeBrowserMainExtraPartsProfiles::
   ChromeBrowsingDataRemoverDelegateFactory::GetInstance();
   ChromeSigninClientFactory::GetInstance();
   ClientHintsFactory::GetInstance();
+#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
+  cloud_print::PrivetNotificationServiceFactory::GetInstance();
+#endif
 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) && !defined(OS_CHROMEOS)
   CloudPrintProxyServiceFactory::GetInstance();
 #endif
   ConsentAuditorFactory::GetInstance();
   ContentSuggestionsServiceFactory::GetInstance();
   CookieSettingsFactory::GetInstance();
-  NotifierStateTrackerFactory::GetInstance();
   DomainDiversityReporterFactory::GetInstance();
   dom_distiller::DomDistillerServiceFactory::GetInstance();
   DownloadCoreServiceFactory::GetInstance();
   DownloadServiceFactory::GetInstance();
 #if defined(OS_ANDROID)
   explore_sites::ExploreSitesServiceFactory::GetInstance();
+#endif
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  extensions::ExtensionManagementFactory::GetInstance();
 #endif
   FaviconServiceFactory::GetInstance();
-  HistoryUiFaviconRequestHandlerFactory::GetInstance();
 #if BUILDFLAG(ENABLE_LEGACY_DESKTOP_IN_PRODUCT_HELP)
   feature_engagement::BookmarkTrackerFactory::GetInstance();
   feature_engagement::IncognitoWindowTrackerFactory::GetInstance();
@@ -262,66 +266,61 @@ void ChromeBrowserMainExtraPartsProfiles::
 #endif
   GoogleSearchDomainMixingMetricsEmitterFactory::GetInstance();
   HistoryServiceFactory::GetInstance();
+  HistoryUiFaviconRequestHandlerFactory::GetInstance();
   HostContentSettingsMapFactory::GetInstance();
   IdentityManagerFactory::EnsureFactoryAndDependeeFactoriesBuilt();
   InMemoryURLIndexFactory::GetInstance();
 #if !defined(OS_ANDROID)
   InstantServiceFactory::GetInstance();
-#endif
-#if BUILDFLAG(ENABLE_SERVICE_DISCOVERY)
-  cloud_print::PrivetNotificationServiceFactory::GetInstance();
-#endif
-  RendererUpdaterFactory::GetInstance();
-#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
-  SupervisedUserServiceFactory::GetInstance();
 #endif
   LanguageModelManagerFactory::GetInstance();
 #if !defined(OS_ANDROID)
   LoginUIServiceFactory::GetInstance();
-#endif
-  if (MediaEngagementService::IsEnabled())
-    MediaEngagementServiceFactory::GetInstance();
-  media_router::MediaRouterFactory::GetInstance();
-#if !defined(OS_ANDROID)
-  media_router::MediaRouterUIServiceFactory::GetInstance();
 #endif
 #if defined(OS_ANDROID)
   MediaDrmOriginIdManagerFactory::GetInstance();
 #endif
+  if (MediaEngagementService::IsEnabled())
+    MediaEngagementServiceFactory::GetInstance();
+  media_feeds::MediaFeedsServiceFactory::GetInstance();
 #if !defined(OS_ANDROID)
   MediaGalleriesPreferencesFactory::GetInstance();
 #endif
-  media_feeds::MediaFeedsServiceFactory::GetInstance();
   if (base::FeatureList::IsEnabled(media::kUseMediaHistoryStore))
     media_history::MediaHistoryKeyedServiceFactory::GetInstance();
+  media_router::MediaRouterFactory::GetInstance();
+#if !defined(OS_ANDROID)
+  media_router::MediaRouterUIServiceFactory::GetInstance();
+#endif
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
     (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance();
 #endif
   ModelTypeStoreServiceFactory::GetInstance();
+  NotifierStateTrackerFactory::GetInstance();
 #if !defined(OS_ANDROID)
   NTPResourceCacheFactory::GetInstance();
 #endif
   PasswordStoreFactory::GetInstance();
 #if !defined(OS_ANDROID)
   PinnedTabServiceFactory::GetInstance();
-  ThemeServiceFactory::GetInstance();
 #endif
 #if BUILDFLAG(ENABLE_PLUGINS)
   PluginPrefsFactory::GetInstance();
 #endif
   PrefsTabHelper::GetServiceInstance();
+  policy::UserCloudPolicyInvalidatorFactory::GetInstance();
 #if !defined(OS_CHROMEOS)
   policy::UserPolicySigninServiceFactory::GetInstance();
 #endif
-  policy::UserCloudPolicyInvalidatorFactory::GetInstance();
   predictors::AutocompleteActionPredictorFactory::GetInstance();
-  predictors::PredictorDatabaseFactory::GetInstance();
   predictors::LoadingPredictorFactory::GetInstance();
+  predictors::PredictorDatabaseFactory::GetInstance();
   prerender::PrerenderLinkManagerFactory::GetInstance();
   prerender::PrerenderManagerFactory::GetInstance();
   ProfileSyncServiceFactory::GetInstance();
   ProtocolHandlerRegistryFactory::GetInstance();
+  RendererUpdaterFactory::GetInstance();
 #if !defined(OS_ANDROID)
   resource_coordinator::LocalSiteCharacteristicsDataStoreFactory::GetInstance();
 #endif
@@ -338,10 +337,8 @@ void ChromeBrowserMainExtraPartsProfiles::
   SharingServiceFactory::GetInstance();
   ShortcutsBackendFactory::GetInstance();
   SigninProfileAttributesUpdaterFactory::GetInstance();
-
   if (SiteEngagementService::IsEnabled())
     SiteEngagementServiceFactory::GetInstance();
-
 #if BUILDFLAG(ENABLE_SPELLCHECK)
   SpellcheckServiceFactory::GetInstance();
 #endif
@@ -349,9 +346,15 @@ void ChromeBrowserMainExtraPartsProfiles::
   StorageNotificationServiceFactory::GetInstance();
 #endif
   suggestions::SuggestionsServiceFactory::GetInstance();
+#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
+  SupervisedUserServiceFactory::GetInstance();
+#endif
   TabRestoreServiceFactory::GetInstance();
   TemplateURLFetcherFactory::GetInstance();
   TemplateURLServiceFactory::GetInstance();
+#if !defined(OS_ANDROID)
+  ThemeServiceFactory::GetInstance();
+#endif
   TopSitesFactory::GetInstance();
   translate::TranslateRankerFactory::GetInstance();
 #if defined(OS_WIN)
@@ -363,8 +366,8 @@ void ChromeBrowserMainExtraPartsProfiles::
   UsbChooserContextFactory::GetInstance();
 #endif
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-  web_app::WebAppProviderFactory::GetInstance();
   web_app::WebAppMetricsFactory::GetInstance();
+  web_app::WebAppProviderFactory::GetInstance();
 #endif
   WebDataServiceFactory::GetInstance();
   webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();

extensions/browser/browser_context_keyed_service_factories.cc

@@ -30,9 +30,6 @@
 #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/web_request/web_request_api.h"
@@ -43,6 +40,10 @@
 #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"
+#endif
+
 namespace extensions {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
@@ -81,8 +82,6 @@ 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();

extensions/shell/browser/shell_browser_context_keyed_service_factories.cc

@@ -5,18 +5,14 @@
 #include "extensions/shell/browser/shell_browser_context_keyed_service_factories.h"
 
 #include "extensions/browser/updater/update_service_factory.h"
-#include "extensions/shell/browser/api/identity/identity_api.h"
 #include "extensions/shell/browser/shell_extension_system_factory.h"
 
 namespace extensions {
 namespace shell {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  // TODO(rockot): Remove this once UpdateService is supported across all
-  // extensions embedders (and namely chrome.)
-  UpdateServiceFactory::GetInstance();
-
   ShellExtensionSystemFactory::GetInstance();
+  UpdateServiceFactory::GetInstance();
 }
 
 }  // namespace shell

weblayer/browser/browser_main_parts_impl.cc

@@ -62,13 +62,12 @@ namespace {
 // Instantiates all weblayer KeyedService factories, which is
 // especially important for services that should be created at profile
 // creation time as compared to lazily on first access.
-static void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
-  StatefulSSLHostStateDelegateFactory::GetInstance();
-  HostContentSettingsMapFactory::GetInstance();
-
+void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
   CaptivePortalServiceFactory::GetInstance();
 #endif
+  HostContentSettingsMapFactory::GetInstance();
+  StatefulSSLHostStateDelegateFactory::GetInstance();
 }
 
 void StopMessageLoop(base::OnceClosure quit_closure) {