EnsureBrowserContextKeyedServicesFactoriesBuilt -- Chrome common Factories

Add missing common Chrome KeyedServiceFactories to the initialisation
list in `EnsureBrowserContextKeyedServicesFactoriesBuilt()` to properly
populate the dependency graph at start.

If the factory `GetInstance()` method does not exist, is private, or
the whole factory is private (or implemented in a .cc file), only expose an `EnsureFactoryBuilt()` method in the relative service or
code that matters.

Bug: 1412439
Change-Id: I643473899914b9c28886e9511138881265b243b0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4190213
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Colin Blundell <[email protected]>
Code-Coverage: Findit <[email protected]>
Commit-Queue: Ryan Sultanem <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1102058}

Author: Ryan Sultanem

apps/browser_context_keyed_service_factories.cc

@@ -16,6 +16,7 @@ namespace apps {
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   AppLifetimeMonitorFactory::GetInstance();
   AppRestoreServiceFactory::GetInstance();
+  SavedFilesServiceFactory::GetInstance();
 }
 
 void NotifyApplicationTerminating(content::BrowserContext* browser_context) {

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

@@ -6,18 +6,21 @@
 
 #include "build/chromeos_buildflags.h"
 
+#include "chrome/browser/apps/platform_apps/api/media_galleries/media_galleries_api.h"
+#include "chrome/browser/apps/platform_apps/api/sync_file_system/extension_sync_event_observer.h"
+
 #if BUILDFLAG(IS_CHROMEOS_ASH)
 #include "chrome/browser/apps/platform_apps/api/arc_apps_private/arc_apps_private_api.h"
 #endif
 
-namespace chrome_apps {
-namespace api {
+namespace chrome_apps::api {
 
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
 #if BUILDFLAG(IS_CHROMEOS_ASH)
   ArcAppsPrivateAPI::GetFactoryInstance();
 #endif
+  ExtensionSyncEventObserver::GetFactoryInstance();
+  MediaGalleriesEventRouter::GetFactoryInstance();
 }
 
-}  // namespace api
-}  // namespace chrome_apps
+}  // namespace chrome_apps::api

chrome/browser/history_clusters/history_clusters_service_factory.cc

@@ -69,3 +69,8 @@ KeyedService* HistoryClustersServiceFactory::BuildServiceInstanceFor(
       OptimizationGuideKeyedServiceFactory::GetForProfile(profile),
       profile->GetPrefs());
 }
+
+// static
+void HistoryClustersServiceFactory::EnsureFactoryBuilt() {
+  GetInstance();
+}

chrome/browser/history_clusters/history_clusters_service_factory.h

@@ -21,6 +21,8 @@ class HistoryClustersServiceFactory : public ProfileKeyedServiceFactory {
   static history_clusters::HistoryClustersService* GetForBrowserContext(
       content::BrowserContext* browser_context);
 
+  static void EnsureFactoryBuilt();
+
  private:
   friend base::NoDestructor<HistoryClustersServiceFactory>;
   static HistoryClustersServiceFactory& GetInstance();

chrome/browser/image_service/image_service_factory.cc

@@ -40,4 +40,9 @@ KeyedService* ImageServiceFactory::BuildServiceInstanceFor(
       SyncServiceFactory::GetForProfile(profile));
 }
 
+// static
+void ImageServiceFactory::EnsureFactoryBuilt() {
+  GetInstance();
+}
+
 }  // namespace image_service

chrome/browser/image_service/image_service_factory.h

@@ -24,6 +24,8 @@ class ImageServiceFactory : public ProfileKeyedServiceFactory {
   static ImageService* GetForBrowserContext(
       content::BrowserContext* browser_context);
 
+  static void EnsureFactoryBuilt();
+
  private:
   friend base::NoDestructor<ImageServiceFactory>;
   static ImageServiceFactory& GetInstance();

chrome/browser/lookalikes/lookalike_url_service.cc

@@ -371,3 +371,8 @@ void LookalikeUrlService::OnUIDisabledFirstVisit(const GURL& url) {
 void LookalikeUrlService::ResetWarningDismissedETLDPlusOnesForTesting() {
   warning_dismissed_etld1s_.clear();
 }
+
+// static
+void LookalikeUrlService::EnsureFactoryBuilt() {
+  LookalikeUrlServiceFactory::GetInstance();
+}

chrome/browser/lookalikes/lookalike_url_service.h

@@ -150,6 +150,8 @@ class LookalikeUrlService : public KeyedService {
   // for testing.
   void ResetWarningDismissedETLDPlusOnesForTesting();
 
+  static void EnsureFactoryBuilt();
+
  private:
   // Called when an async engaged site computation is finished.
   void OnUpdateEngagedSitesCompleted(

chrome/browser/media_galleries/media_file_system_registry.cc

@@ -697,3 +697,9 @@ void MediaFileSystemRegistry::OnProfileShutdown(Profile* profile) {
   DCHECK(profile_subscription_it != profile_subscription_map_.end());
   profile_subscription_map_.erase(profile_subscription_it);
 }
+
+// static
+BrowserContextKeyedServiceShutdownNotifierFactory*
+MediaFileSystemRegistry::GetFactoryInstance() {
+  return MediaFileSystemRegistryShutdownNotifierFactory::GetInstance();
+}

chrome/browser/media_galleries/media_file_system_registry.h

@@ -20,6 +20,7 @@
 #include "components/keyed_service/core/keyed_service_shutdown_notifier.h"
 #include "components/storage_monitor/removable_storage_observer.h"
 
+class BrowserContextKeyedServiceShutdownNotifierFactory;
 class ExtensionGalleriesHost;
 class GalleryWatchManager;
 class MediaFileSystemContext;
@@ -99,6 +100,9 @@ class MediaFileSystemRegistry
   void OnRemovableStorageDetached(
       const storage_monitor::StorageInfo& info) override;
 
+  static BrowserContextKeyedServiceShutdownNotifierFactory*
+  GetFactoryInstance();
+
  private:
   class MediaFileSystemContextImpl;
 

chrome/browser/plugins/plugin_info_host_impl.cc

@@ -383,6 +383,11 @@ void PluginInfoHostImpl::GetPluginInfoFinish(
   std::move(callback).Run(std::move(output));
 }
 
+// static
+void PluginInfoHostImpl::EnsureFactoryBuilt() {
+  PluginInfoHostImplShutdownNotifierFactory::GetInstance();
+}
+
 void PluginInfoHostImpl::Context::MaybeGrantAccess(
     chrome::mojom::PluginStatus status,
     const base::FilePath& path) const {

chrome/browser/plugins/plugin_info_host_impl.h

@@ -105,6 +105,8 @@ class PluginInfoHostImpl : public chrome::mojom::PluginInfoHost {
                      const std::string& mime_type,
                      GetPluginInfoCallback callback) override;
 
+  static void EnsureFactoryBuilt();
+
  private:
   void ShutdownOnUIThread();