Adapted more keyed factories to be part of the ProfileSelections API

Migrated extensions/ and apps/ factories to use ProfileSelections API through the ExtensionsBrowserClient. Since these factories cannot inherit from ProfileKeyedServiceFactory, the equivalent checks are done through the added getters in the ExtensionsBrowserClient.

Extensions Factories: force values for Guest Profile is set to true, by default extensions services will be created for Guest Profile.

Also migrated additional chrome/ Factories to use ProfileKeyedServiceFactory.

Bug: 1284664
Change-Id: Ia4ee29cf4c430f99d078cda7c60e946b369ea178
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3894435
Reviewed-by: David Roger <[email protected]>
Reviewed-by: Dominick Ng <[email protected]>
Reviewed-by: Devlin Cronin <[email protected]>
Commit-Queue: Ryan Sultanem <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1057936}

Author: Ryan Sultanem

apps/app_lifetime_monitor_factory.cc

@@ -45,8 +45,9 @@ bool AppLifetimeMonitorFactory::ServiceIsCreatedWithBrowserContext() const {
 
 content::BrowserContext* AppLifetimeMonitorFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return extensions::ExtensionsBrowserClient::Get()->
-      GetOriginalContext(context);
+  return extensions::ExtensionsBrowserClient::Get()
+      ->GetRedirectedContextInIncognito(context, /*force_guest_profile=*/true,
+                                        /*force_system_profile=*/false);
 }
 
 }  // namespace apps

apps/app_restore_service_factory.cc

@@ -8,6 +8,7 @@
 #include "apps/app_restore_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
+#include "extensions/browser/extensions_browser_client.h"
 
 namespace apps {
 
@@ -40,4 +41,11 @@ bool AppRestoreServiceFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
+content::BrowserContext* AppRestoreServiceFactory::GetBrowserContextToUse(
+    content::BrowserContext* context) const {
+  return extensions::ExtensionsBrowserClient::Get()
+      ->GetRedirectedContextInIncognito(context, /*force_guest_profile=*/true,
+                                        /*force_system_profile=*/false);
+}
+
 }  // namespace apps

apps/app_restore_service_factory.h

@@ -37,6 +37,8 @@ class AppRestoreServiceFactory : public BrowserContextKeyedServiceFactory {
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
   bool ServiceIsCreatedWithBrowserContext() const override;
+  content::BrowserContext* GetBrowserContextToUse(
+      content::BrowserContext* context) const override;
 };
 
 }  // namespace apps

chrome/browser/breadcrumbs/BUILD.gn

@@ -5,7 +5,7 @@
 source_set("breadcrumbs") {
   deps = [
     "//base",
-    "//chrome/browser/profiles",
+    "//chrome/browser/profiles:profile",
     "//chrome/common",
     "//components/breadcrumbs/core",
     "//components/infobars/content",

chrome/browser/breadcrumbs/breadcrumb_manager_keyed_service_factory.cc

@@ -5,9 +5,7 @@
 #include "chrome/browser/breadcrumbs/breadcrumb_manager_keyed_service_factory.h"
 
 #include "base/no_destructor.h"
-#include "chrome/browser/profiles/incognito_helpers.h"
 #include "components/breadcrumbs/core/breadcrumb_manager_keyed_service.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 
 // static
@@ -27,9 +25,9 @@ BreadcrumbManagerKeyedServiceFactory::GetForBrowserContext(
 }
 
 BreadcrumbManagerKeyedServiceFactory::BreadcrumbManagerKeyedServiceFactory()
-    : BrowserContextKeyedServiceFactory(
+    : ProfileKeyedServiceFactory(
           "BreadcrumbManagerService",
-          BrowserContextDependencyManager::GetInstance()) {}
+          ProfileSelections::BuildForRegularAndIncognito()) {}
 
 BreadcrumbManagerKeyedServiceFactory::~BreadcrumbManagerKeyedServiceFactory() =
     default;
@@ -39,9 +37,3 @@ KeyedService* BreadcrumbManagerKeyedServiceFactory::BuildServiceInstanceFor(
   return new breadcrumbs::BreadcrumbManagerKeyedService(
       context->IsOffTheRecord());
 }
-
-content::BrowserContext*
-BreadcrumbManagerKeyedServiceFactory::GetBrowserContextToUse(
-    content::BrowserContext* context) const {
-  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
-}

chrome/browser/breadcrumbs/breadcrumb_manager_keyed_service_factory.h

@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_BREADCRUMBS_BREADCRUMB_MANAGER_KEYED_SERVICE_FACTORY_H_
 
 #include "base/no_destructor.h"
-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 namespace breadcrumbs {
 class BreadcrumbManagerKeyedService;
@@ -16,8 +16,7 @@ namespace content {
 class BrowserContext;
 }  // namespace content
 
-class BreadcrumbManagerKeyedServiceFactory
-    : public BrowserContextKeyedServiceFactory {
+class BreadcrumbManagerKeyedServiceFactory : public ProfileKeyedServiceFactory {
  public:
   static BreadcrumbManagerKeyedServiceFactory* GetInstance();
 
@@ -39,8 +38,6 @@ class BreadcrumbManagerKeyedServiceFactory
   // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override;
 };
 
 #endif  // CHROME_BROWSER_BREADCRUMBS_BREADCRUMB_MANAGER_KEYED_SERVICE_FACTORY_H_

chrome/browser/extensions/extension_system_factory.cc

@@ -101,8 +101,9 @@ KeyedService* ExtensionSystemFactory::BuildServiceInstanceFor(
 
 content::BrowserContext* ExtensionSystemFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  // Separate instance in incognito.
-  return context;
+  return ProfileSelections::BuildForRegularAndIncognito(
+             /*force_guest=*/true, /*force_system=*/false)
+      .ApplyProfileSelection(Profile::FromBrowserContext(context));
 }
 
 bool ExtensionSystemFactory::ServiceIsCreatedWithBrowserContext() const {

chrome/browser/feedback/feedback_uploader_factory_chrome.cc

@@ -7,6 +7,7 @@
 #include "base/memory/singleton.h"
 #include "chrome/browser/feedback/feedback_uploader_chrome.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_selections.h"
 #include "content/public/browser/browser_context.h"
 
 namespace feedback {
@@ -30,7 +31,8 @@ FeedbackUploaderFactoryChrome::~FeedbackUploaderFactoryChrome() = default;
 
 content::BrowserContext* FeedbackUploaderFactoryChrome::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return Profile::FromBrowserContext(context)->GetOriginalProfile();
+  return ProfileSelections::BuildRedirectedInIncognito().ApplyProfileSelection(
+      Profile::FromBrowserContext(context));
 }
 
 bool FeedbackUploaderFactoryChrome::ServiceIsCreatedWithBrowserContext() const {

chrome/browser/updates/announcement_notification/BUILD.gn

@@ -23,6 +23,7 @@ source_set("announcement_notification") {
     "//base",
     "//chrome/app:generated_resources",
     "//chrome/browser:browser_process",
+    "//chrome/browser/profiles:profile",
     "//components/keyed_service/content",
     "//components/pref_registry",
     "//components/prefs:prefs",

chrome/browser/updates/announcement_notification/announcement_notification_service_factory.cc

@@ -10,12 +10,10 @@
 #include "base/time/default_clock.h"
 #include "build/build_config.h"
 #include "chrome/browser/notifications/notification_display_service_factory.h"  // nogncheck
-#include "chrome/browser/profiles/incognito_helpers.h"  // nogncheck
-#include "chrome/browser/profiles/profile.h"            // nogncheck
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/updates/announcement_notification/announcement_notification_delegate.h"
 #include "chrome/browser/updates/announcement_notification/announcement_notification_service.h"
 #include "chrome/browser/updates/announcement_notification/empty_announcement_notification_service.h"
-#include "components/keyed_service/content/browser_context_dependency_manager.h"
 
 #if BUILDFLAG(IS_ANDROID)
 #include "chrome/browser/updates/announcement_notification/announcement_notification_delegate_android.h"
@@ -57,16 +55,10 @@ KeyedService* AnnouncementNotificationServiceFactory::BuildServiceInstanceFor(
       profile, pref, std::move(delegate), base::DefaultClock::GetInstance());
 }
 
-content::BrowserContext*
-AnnouncementNotificationServiceFactory::GetBrowserContextToUse(
-    content::BrowserContext* context) const {
-  return chrome::GetBrowserContextOwnInstanceInIncognito(context);
-}
-
 AnnouncementNotificationServiceFactory::AnnouncementNotificationServiceFactory()
-    : BrowserContextKeyedServiceFactory(
+    : ProfileKeyedServiceFactory(
           "AnnouncementNotificationService",
-          BrowserContextDependencyManager::GetInstance()) {
+          ProfileSelections::BuildForRegularAndIncognito()) {
   DependsOn(NotificationDisplayServiceFactory::GetInstance());
 }
 

chrome/browser/updates/announcement_notification/announcement_notification_service_factory.h

@@ -6,14 +6,14 @@
 #define CHROME_BROWSER_UPDATES_ANNOUNCEMENT_NOTIFICATION_ANNOUNCEMENT_NOTIFICATION_SERVICE_FACTORY_H_
 
 #include "base/no_destructor.h"
-#include "components/keyed_service/content/browser_context_keyed_service_factory.h"
+#include "chrome/browser/profiles/profile_keyed_service_factory.h"
 
 class AnnouncementNotificationService;
 class Profile;
 
 // Factory to create FastTrackNotificationService.
 class AnnouncementNotificationServiceFactory
-    : public BrowserContextKeyedServiceFactory {
+    : public ProfileKeyedServiceFactory {
  public:
   static AnnouncementNotificationServiceFactory* GetInstance();
   static AnnouncementNotificationService* GetForProfile(Profile* profile);
@@ -29,8 +29,6 @@ class AnnouncementNotificationServiceFactory
   // BrowserContextKeyedServiceFactory implementation.
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override;
-  content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const override;
 
   AnnouncementNotificationServiceFactory();
   ~AnnouncementNotificationServiceFactory() override;

extensions/browser/api/idle/idle_manager_factory.cc

@@ -42,7 +42,8 @@ KeyedService* IdleManagerFactory::BuildServiceInstanceFor(
 
 content::BrowserContext* IdleManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 bool IdleManagerFactory::ServiceIsCreatedWithBrowserContext() const {

extensions/browser/api/networking_private/networking_private_event_router_factory.cc

@@ -46,7 +46,8 @@ KeyedService* NetworkingPrivateEventRouterFactory::BuildServiceInstanceFor(
 content::BrowserContext*
 NetworkingPrivateEventRouterFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 bool NetworkingPrivateEventRouterFactory::ServiceIsCreatedWithBrowserContext()

extensions/browser/app_window/app_window_registry.cc

@@ -244,7 +244,8 @@ bool AppWindowRegistry::Factory::ServiceIsCreatedWithBrowserContext() const {
 
 content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 }  // namespace extensions

extensions/browser/browser_context_keyed_api_factory.h

@@ -35,15 +35,17 @@ class BrowserContextKeyedAPI : public KeyedService {
   static const bool kServiceHasOwnInstanceInIncognito = false;
 
   // The next two flags allows to force the selection for the System and Guest
-  // Profiles despite the experiments being activated. Setting the value to true
-  // in subclasses to force the selection.
+  // Profiles despite the experiments being activated. Values can be overridden
+  // in subclasses by redefining the variables and setting a different value.
   //
   // Part of experiment to remove System Profile selection by default with
-  // `kSystemProfileSelectionDefaultNone`.
+  // `kSystemProfileSelectionDefaultNone`. By default do not force the value (do
+  // not create extension services) for the System Profile.
   static const bool kForceSelectionForSystemProfile = false;
   // Part of experiment to remove Guest Profile selection by default with
-  // `kGuestProfileSelectionDefaultNone`.
-  static const bool kForceSelectionForGuestProfile = false;
+  // `kGuestProfileSelectionDefaultNone`. By default force the value (create
+  // extension services) for the Guest Profile.
+  static const bool kForceSelectionForGuestProfile = true;
 
   // If set to false, don't start the service at BrowserContext creation time.
   // (The default differs from the BrowserContextKeyedServiceFactory default,

extensions/browser/event_router_factory.cc

@@ -46,7 +46,8 @@ KeyedService* EventRouterFactory::BuildServiceInstanceFor(
 BrowserContext* EventRouterFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 }  // namespace extensions

extensions/browser/extension_pref_value_map_factory.cc

@@ -37,6 +37,7 @@ KeyedService* ExtensionPrefValueMapFactory::BuildServiceInstanceFor(
 content::BrowserContext* ExtensionPrefValueMapFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Redirected in incognito.
-  return extensions::ExtensionsBrowserClient::Get()->GetOriginalContext(
-      context);
+  return extensions::ExtensionsBrowserClient::Get()
+      ->GetRedirectedContextInIncognito(context, /*force_guest_profile=*/true,
+                                        /*force_system_profile=*/false);
 }

extensions/browser/extension_prefs_factory.cc

@@ -62,7 +62,8 @@ KeyedService* ExtensionPrefsFactory::BuildServiceInstanceFor(
 
 content::BrowserContext* ExtensionPrefsFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 }  // namespace extensions

extensions/browser/extension_protocols.cc

@@ -1027,6 +1027,13 @@ class ExtensionURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
       DependsOn(ExtensionRegistryFactory::GetInstance());
       DependsOn(ProcessMapFactory::GetInstance());
     }
+
+    content::BrowserContext* GetBrowserContextToUse(
+        content::BrowserContext* context) const override {
+      return ExtensionsBrowserClient::Get()->GetContextForRegularAndIncognito(
+          context, /*force_guest_profile=*/true,
+          /*force_system_profile=*/false);
+    }
   };
 
   raw_ptr<content::BrowserContext> browser_context_;

extensions/browser/extension_registry_factory.cc

@@ -44,7 +44,8 @@ BrowserContext* ExtensionRegistryFactory::GetBrowserContextToUse(
   // Redirected in incognito.
   auto* extension_browser_client = ExtensionsBrowserClient::Get();
   DCHECK(extension_browser_client);
-  return extension_browser_client->GetOriginalContext(context);
+  return extension_browser_client->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 }  // namespace extensions

extensions/browser/process_manager_factory.cc

@@ -6,6 +6,7 @@
 
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "extensions/browser/extension_registry_factory.h"
+#include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/lazy_background_task_queue_factory.h"
 #include "extensions/browser/process_manager.h"
 
@@ -52,7 +53,8 @@ BrowserContext* ProcessManagerFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // ProcessManager::Create handles guest and incognito profiles, returning an
   // IncognitoProcessManager in incognito mode.
-  return context;
+  return ExtensionsBrowserClient::Get()->GetContextForRegularAndIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 }  // namespace extensions

extensions/browser/renderer_startup_helper.cc

@@ -387,7 +387,8 @@ KeyedService* RendererStartupHelperFactory::BuildServiceInstanceFor(
 BrowserContext* RendererStartupHelperFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);
+  return ExtensionsBrowserClient::Get()->GetRedirectedContextInIncognito(
+      context, /*force_guest_profile=*/true, /*force_system_profile=*/false);
 }
 
 bool RendererStartupHelperFactory::ServiceIsCreatedWithBrowserContext() const {