Reland: Remove force_guest_profile param from context getters.

The only place that didn't hardcode "true" for this can express what it
wants more clearly with constexpr if anyway.

Bug: 364987728
Change-Id: I27cbdf0ac7ac358392af5ea8d6c9257666af6a3b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5938992
Commit-Queue: Stefan Kuhne <skuhne@chromium.org>
Code-Coverage: findit-for-me@appspot.gserviceaccount.com <findit-for-me@appspot.gserviceaccount.com>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: David Bertoni <dbertoni@chromium.org>
Reviewed-by: Stefan Kuhne <skuhne@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1369550}

apps/app_lifetime_monitor_factory.cc

@@ -46,7 +46,7 @@ bool AppLifetimeMonitorFactory::ServiceIsCreatedWithBrowserContext() const {
 content::BrowserContext* AppLifetimeMonitorFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return extensions::ExtensionsBrowserClient::Get()
-      ->GetContextRedirectedToOriginal(context, /*force_guest_profile=*/true);
+      ->GetContextRedirectedToOriginal(context);
 }
 
 }  // namespace apps

apps/app_restore_service_factory.cc

@@ -45,7 +45,7 @@ bool AppRestoreServiceFactory::ServiceIsCreatedWithBrowserContext() const {
 content::BrowserContext* AppRestoreServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return extensions::ExtensionsBrowserClient::Get()
-      ->GetContextRedirectedToOriginal(context, /*force_guest_profile=*/true);
+      ->GetContextRedirectedToOriginal(context);
 }
 
 }  // namespace apps

apps/saved_files_service_factory.cc

@@ -52,7 +52,7 @@ content::BrowserContext* SavedFilesServiceFactory::GetBrowserContextToUse(
   // when apps white-listed in guest sessions attempt to use chrome.fileSystem
   // API.
   return extensions::ExtensionsBrowserClient::Get()
-      ->GetContextRedirectedToOriginal(context, /*force_guest_profile=*/true);
+      ->GetContextRedirectedToOriginal(context);
 }
 
 }  // namespace apps

chrome/browser/extensions/chrome_extensions_browser_client.cc

@@ -281,51 +281,39 @@ content::BrowserContext* ChromeExtensionsBrowserClient::GetOriginalContext(
 
 content::BrowserContext*
 ChromeExtensionsBrowserClient::GetContextRedirectedToOriginal(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
+  return ProfileSelections::Builder()
-  ProfileSelections::Builder builder;
+      .WithRegular(ProfileSelection::kRedirectedToOriginal)
-  builder.WithRegular(ProfileSelection::kRedirectedToOriginal);
+      .WithGuest(ProfileSelection::kRedirectedToOriginal)
-  if (force_guest_profile) {
+      // TODO(crbug.com/41488885): Check if this service is needed for Ash
-    builder.WithGuest(ProfileSelection::kRedirectedToOriginal);
+      // Internals.
-  }
+      .WithAshInternals(ProfileSelection::kRedirectedToOriginal)
-  // TODO(crbug.com/41488885): Check if this service is needed for Ash
+      .Build()
-  // Internals.
+      .ApplyProfileSelection(Profile::FromBrowserContext(context));
-  builder.WithAshInternals(ProfileSelection::kRedirectedToOriginal);
-
-  const ProfileSelections selections = builder.Build();
-  return selections.ApplyProfileSelection(Profile::FromBrowserContext(context));
 }
 
 content::BrowserContext* ChromeExtensionsBrowserClient::GetContextOwnInstance(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
+  return ProfileSelections::Builder()
-  ProfileSelections::Builder builder;
+      .WithRegular(ProfileSelection::kOwnInstance)
-  builder.WithRegular(ProfileSelection::kOwnInstance);
+      .WithGuest(ProfileSelection::kOwnInstance)
-  if (force_guest_profile) {
+      // TODO(crbug.com/41488885): Check if this service is needed for Ash
-    builder.WithGuest(ProfileSelection::kOwnInstance);
+      // Internals.
-  }
+      .WithAshInternals(ProfileSelection::kOwnInstance)
-  // TODO(crbug.com/41488885): Check if this service is needed for Ash
+      .Build()
-  // Internals.
+      .ApplyProfileSelection(Profile::FromBrowserContext(context));
-  builder.WithAshInternals(ProfileSelection::kOwnInstance);
-
-  const ProfileSelections selections = builder.Build();
-  return selections.ApplyProfileSelection(Profile::FromBrowserContext(context));
 }
 
 content::BrowserContext*
 ChromeExtensionsBrowserClient::GetContextForOriginalOnly(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
+  return ProfileSelections::Builder()
-  ProfileSelections::Builder builder;
+      .WithGuest(ProfileSelection::kOriginalOnly)
-  if (force_guest_profile) {
+      // TODO(crbug.com/41488885): Check if this service is needed for Ash
-    builder.WithGuest(ProfileSelection::kOriginalOnly);
+      // Internals.
-  }
+      .WithAshInternals(ProfileSelection::kOriginalOnly)
-  // TODO(crbug.com/41488885): Check if this service is needed for Ash
+      .Build()
-  // Internals.
+      .ApplyProfileSelection(Profile::FromBrowserContext(context));
-  builder.WithAshInternals(ProfileSelection::kOriginalOnly);
-
-  ProfileSelections selections = builder.Build();
-  return selections.ApplyProfileSelection(Profile::FromBrowserContext(context));
 }
 
 bool ChromeExtensionsBrowserClient::AreExtensionsDisabledForContext(

chrome/browser/extensions/chrome_extensions_browser_client.h

@@ -74,19 +74,14 @@ class ChromeExtensionsBrowserClient : public ExtensionsBrowserClient {
       content::BrowserContext* context) override;
   content::BrowserContext* GetOriginalContext(
       content::BrowserContext* context) override;
-
   content::BrowserContext* GetContextRedirectedToOriginal(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextOwnInstance(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextForOriginalOnly(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   bool AreExtensionsDisabledForContext(
       content::BrowserContext* context) override;
-
 #if BUILDFLAG(IS_CHROMEOS)
   std::string GetUserIdHashFromContext(
       content::BrowserContext* context) override;

chrome/browser/extensions/desktop_android/desktop_android_extensions_browser_client.cc

@@ -107,22 +107,19 @@ BrowserContext* DesktopAndroidExtensionsBrowserClient::GetOriginalContext(
 
 content::BrowserContext*
 DesktopAndroidExtensionsBrowserClient::GetContextRedirectedToOriginal(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 
 content::BrowserContext*
 DesktopAndroidExtensionsBrowserClient::GetContextOwnInstance(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 
 content::BrowserContext*
 DesktopAndroidExtensionsBrowserClient::GetContextForOriginalOnly(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 

chrome/browser/extensions/desktop_android/desktop_android_extensions_browser_client.h

@@ -71,14 +71,11 @@ class DesktopAndroidExtensionsBrowserClient : public ExtensionsBrowserClient {
   content::BrowserContext* GetOriginalContext(
       content::BrowserContext* context) override;
   content::BrowserContext* GetContextRedirectedToOriginal(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextOwnInstance(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextForOriginalOnly(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   bool AreExtensionsDisabledForContext(
       content::BrowserContext* context) override;
   bool IsGuestSession(content::BrowserContext* context) const override;

extensions/browser/api/device_permissions_manager.cc

@@ -690,9 +690,8 @@ BrowserContext* DevicePermissionsManagerFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Return the original (possibly off-the-record) browser context so that a
   // separate instance of the DevicePermissionsManager is used in incognito
-  // mode. The parent class's implemenation returns NULL.
+  // mode. The parent class's implementation returns null.
-  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-      context, /*force_guest_profile=*/true);
 }
 
 }  // namespace extensions

extensions/browser/api/idle/idle_manager_factory.cc

@@ -45,7 +45,7 @@ IdleManagerFactory::BuildServiceInstanceForBrowserContext(
 content::BrowserContext* IdleManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool IdleManagerFactory::ServiceIsCreatedWithBrowserContext() const {

extensions/browser/api/networking_private/networking_private_delegate_factory.cc

@@ -84,7 +84,7 @@ NetworkingPrivateDelegateFactory::BuildServiceInstanceForBrowserContext(
 BrowserContext* NetworkingPrivateDelegateFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/api/networking_private/networking_private_event_router_factory.cc

@@ -45,7 +45,7 @@ content::BrowserContext*
 NetworkingPrivateEventRouterFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool NetworkingPrivateEventRouterFactory::ServiceIsCreatedWithBrowserContext()

extensions/browser/api/offscreen/offscreen_api.cc

@@ -37,8 +37,7 @@ content::BrowserContext& GetBrowserContextToUse(
 
   // The on-the-record profile always uses itself.
   if (!calling_context.IsOffTheRecord()) {
-    return *client->GetContextForOriginalOnly(&calling_context,
+    return *client->GetContextForOriginalOnly(&calling_context);
-                                              /*force_guest_profile=*/true);
   }
 
   DCHECK(util::IsIncognitoEnabled(extension.id(), &calling_context))
@@ -47,10 +46,9 @@ content::BrowserContext& GetBrowserContextToUse(
   // Split-mode extensions use the incognito (calling) context; spanning mode
   // extensions fall back to the original profile.
   bool is_split_mode = IncognitoInfo::IsSplitMode(&extension);
-  return is_split_mode ? *client->GetContextOwnInstance(
+  return is_split_mode
-                             &calling_context, /*force_guest_profile=*/true)
+             ? *client->GetContextOwnInstance(&calling_context)
-                       : *client->GetContextRedirectedToOriginal(
+             : *client->GetContextRedirectedToOriginal(&calling_context);
-                             &calling_context, /*force_guest_profile=*/true);
 }
 
 // Similar to the above, returns the OffscreenDocumentManager to use for the

extensions/browser/api/offscreen/offscreen_document_manager.cc

@@ -67,8 +67,7 @@ OffscreenDocumentManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Use the `context` passed in; this service has separate instances in
   // on-the-record and incognito.
-  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-      context, /*force_guest_profile=*/true);
 }
 
 KeyedService* OffscreenDocumentManagerFactory::BuildServiceInstanceFor(

extensions/browser/api/printer_provider/printer_provider_api_factory.cc

@@ -52,7 +52,7 @@ PrinterProviderAPIFactory::BuildServiceInstanceForBrowserContext(
 content::BrowserContext* PrinterProviderAPIFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/api/socket/app_firewall_hole_manager.cc

@@ -49,8 +49,7 @@ class AppFirewallHoleManagerFactory : public BrowserContextKeyedServiceFactory {
 
   BrowserContext* GetBrowserContextToUse(
       BrowserContext* context) const override {
-    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-        context, /*force_guest_profile=*/true);
   }
 };
 

extensions/browser/api/storage/session_storage_manager.cc

@@ -55,7 +55,7 @@ content::BrowserContext* SessionStorageManagerFactory::GetBrowserContextToUse(
   // Share storage between incognito and on-the-record profiles by using the
   // original context of an incognito window.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      browser_context, /*force_guest_profile=*/true);
+      browser_context);
 }
 
 KeyedService* SessionStorageManagerFactory::BuildServiceInstanceFor(

extensions/browser/api/web_request/web_request_event_router_factory.cc

@@ -51,7 +51,7 @@ BrowserContext* WebRequestEventRouterFactory::GetBrowserContextToUse(
   // WebRequestAPI shares an instance between regular and incognito profiles,
   // so this must do the same.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool WebRequestEventRouterFactory::ServiceIsCreatedWithBrowserContext() const {

extensions/browser/api/web_request/web_request_proxying_url_loader_factory.cc

@@ -105,8 +105,7 @@ class ShutdownNotifierFactory
 
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
-    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-        context, /*force_guest_profile=*/true);
   }
 };
 

extensions/browser/api/web_request/web_request_proxying_websocket.cc

@@ -47,8 +47,7 @@ class ShutdownNotifierFactory
 
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
-    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-        context, /*force_guest_profile=*/true);
   }
 };
 

extensions/browser/app_window/app_window_geometry_cache.cc

@@ -297,7 +297,7 @@ content::BrowserContext*
 AppWindowGeometryCache::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 void AppWindowGeometryCache::AddObserver(Observer* observer) {

extensions/browser/app_window/app_window_registry.cc

@@ -246,7 +246,7 @@ bool AppWindowRegistry::Factory::ServiceIsCreatedWithBrowserContext() const {
 content::BrowserContext* AppWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/browser_context_keyed_api_factory.h

@@ -152,18 +152,22 @@ class BrowserContextKeyedAPIFactory : public BrowserContextKeyedServiceFactory {
   // These can be effectively overridden with template specializations.
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
-    if (T::kServiceRedirectedInIncognito) {
+    // The GetContext...() implementations below treat guest sessions like
-      return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
+    // normal ones, so explicitly exclude guest sessions here if necessary.
-          context, T::kServiceIsCreatedInGuestMode);
+    auto* const client = ExtensionsBrowserClient::Get();
+    if constexpr (!T::kServiceIsCreatedInGuestMode) {
+      if (client->IsGuestSession(context)) {
+        return nullptr;
+      }
     }
 
-    if (T::kServiceHasOwnInstanceInIncognito) {
+    if constexpr (T::kServiceRedirectedInIncognito) {
-      return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+      return client->GetContextRedirectedToOriginal(context);
-          context, T::kServiceIsCreatedInGuestMode);
+    } else if constexpr (T::kServiceHasOwnInstanceInIncognito) {
+      return client->GetContextOwnInstance(context);
+    } else {
+      return client->GetContextForOriginalOnly(context);
     }
-
-    return ExtensionsBrowserClient::Get()->GetContextForOriginalOnly(
-        context, T::kServiceIsCreatedInGuestMode);
   }
 
   bool ServiceIsCreatedWithBrowserContext() const override {

extensions/browser/event_router_factory.cc

@@ -48,7 +48,7 @@ BrowserContext* EventRouterFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool EventRouterFactory::ServiceIsNULLWhileTesting() const {

extensions/browser/extension_action_manager.cc

@@ -47,7 +47,7 @@ class ExtensionActionManagerFactory : public BrowserContextKeyedServiceFactory {
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
     return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-        context, /*force_guest_profile=*/true);
+        context);
   }
 };
 

extensions/browser/extension_function.cc

@@ -282,7 +282,7 @@ class BrowserContextShutdownNotifierFactory
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
     return extensions::ExtensionsBrowserClient::Get()->GetContextOwnInstance(
-        context, /*force_guest_profile=*/true);
+        context);
   }
 };
 

extensions/browser/extension_host_registry.cc

@@ -56,7 +56,7 @@ content::BrowserContext* ExtensionHostRegistryFactory::GetBrowserContextToUse(
   // the original context. This makes it quite challenging to let this have its
   // own incognito context.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 KeyedService* ExtensionHostRegistryFactory::BuildServiceInstanceFor(

extensions/browser/extension_pref_value_map_factory.cc

@@ -39,5 +39,5 @@ content::BrowserContext* ExtensionPrefValueMapFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Redirected in incognito.
   return extensions::ExtensionsBrowserClient::Get()
-      ->GetContextRedirectedToOriginal(context, /*force_guest_profile=*/true);
+      ->GetContextRedirectedToOriginal(context);
 }

extensions/browser/extension_prefs_factory.cc

@@ -68,7 +68,7 @@ ExtensionPrefsFactory::BuildServiceInstanceForBrowserContext(
 content::BrowserContext* ExtensionPrefsFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/extension_prefs_helper_factory.cc

@@ -45,7 +45,7 @@ ExtensionPrefsHelperFactory::BuildServiceInstanceForBrowserContext(
 content::BrowserContext* ExtensionPrefsHelperFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool ExtensionPrefsHelperFactory::ServiceIsNULLWhileTesting() const {

extensions/browser/extension_protocols.cc

@@ -998,8 +998,7 @@ class ExtensionURLLoaderFactory : public network::SelfDeletingURLLoaderFactory {
 
     content::BrowserContext* GetBrowserContextToUse(
         content::BrowserContext* context) const override {
-      return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+      return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-          context, /*force_guest_profile=*/true);
     }
   };
 

extensions/browser/extension_registry_factory.cc

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

extensions/browser/extensions_browser_client.h

@@ -168,31 +168,24 @@ class ExtensionsBrowserClient {
   // //chrome where their implementation filters out Profiles based on their
   // types (Regular, Guest, System, etc..) and sub-implementation (Original vs
   // OTR).
-  //
+
-  // Returns the Original `BrowserContext` based on the input `context`:
+  // - if `context` is a System Profile: returns null.
   // - if `context` is Original: returns itself.
-  // - if `context` is OTR: returns the equivalent parent context.
+  // - if `context` is OTR: returns the associated parent context.
-  // - returns nullptr if the underlying implementation of `context` is of type
-  // System Profile, or of type Guest Profile if `force_guest_profile` is false.
   virtual content::BrowserContext* GetContextRedirectedToOriginal(
-      content::BrowserContext* context,
+      content::BrowserContext* context) = 0;
-      bool force_guest_profile) = 0;
+
-  // Returns its own instance of `BrowserContext` based on the input `context`:
+  // - if `context` is a System Profile: returns null.
   // - if `context` is Original: returns itself.
-  // - if `context` is OTR: returns nullptr.
+  // - if `context` is OTR: returns itself.
-  // - returns nullptr if the underlying implementation of `context` is of type
-  // System Profile, or of type Guest Profile if `force_guest_profile` is false.
   virtual content::BrowserContext* GetContextOwnInstance(
-      content::BrowserContext* context,
+      content::BrowserContext* context) = 0;
-      bool force_guest_profile) = 0;
+
-  // Returns the Original `BrowserContext` based on the input `context`:
+  // - if `context` is a System Profile: returns null.
   // - if `context` is Original: returns itself.
-  // - if `context` is OTR: returns nullptr.
+  // - if `context` is OTR: returns null.
-  // - returns nullptr if the underlying implementation of `context` is of type
-  // System Profile, or of type Guest Profile if `force_guest_profile` is false.
   virtual content::BrowserContext* GetContextForOriginalOnly(
-      content::BrowserContext* context,
+      content::BrowserContext* context) = 0;
-      bool force_guest_profile) = 0;
 
   // Returns whether the `context` has extensions disabled.
   // An example of an implementation of `BrowserContext` that has extensions

extensions/browser/guest_view/mime_handler_view/mime_handler_stream_manager.cc

@@ -62,7 +62,7 @@ content::BrowserContext*
 MimeHandlerStreamManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return extensions::ExtensionsBrowserClient::Get()
-      ->GetContextRedirectedToOriginal(context, /*force_guest_profile=*/true);
+      ->GetContextRedirectedToOriginal(context);
 }
 
 }  // namespace

extensions/browser/image_loader_factory.cc

@@ -39,7 +39,7 @@ ImageLoaderFactory::BuildServiceInstanceForBrowserContext(
 content::BrowserContext* ImageLoaderFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/lazy_background_task_queue_factory.cc

@@ -47,7 +47,7 @@ BrowserContext* LazyBackgroundTaskQueueFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/message_tracker.cc

@@ -70,7 +70,7 @@ content::BrowserContext* MessageTrackerFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // One instance will exist across incognito and regular contexts.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 std::unique_ptr<KeyedService>

extensions/browser/permissions_manager.cc

@@ -242,7 +242,7 @@ PermissionsManager* PermissionsManagerFactory::GetForBrowserContext(
 content::BrowserContext* PermissionsManagerFactory::GetBrowserContextToUse(
     content::BrowserContext* browser_context) const {
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      browser_context, /*force_guest_profile=*/true);
+      browser_context);
 }
 
 KeyedService* PermissionsManagerFactory::BuildServiceInstanceFor(

extensions/browser/process_manager.cc

@@ -190,15 +190,15 @@ std::unique_ptr<ProcessManager> ProcessManager::Create(
     // a regular incognito mode, background pages of extensions must be
     // created regardless of whether extensions use "spanning" or "split"
     // incognito behavior.
-    BrowserContext* original_context = client->GetContextRedirectedToOriginal(
+    BrowserContext* original_context =
-        context, /*force_guest_profile=*/true);
+        client->GetContextRedirectedToOriginal(context);
     return std::make_unique<ProcessManager>(context, original_context,
                                             extension_registry);
   }
 
   if (context->IsOffTheRecord()) {
-    BrowserContext* original_context = client->GetContextRedirectedToOriginal(
+    BrowserContext* original_context =
-        context, /*force_guest_profile=*/true);
+        client->GetContextRedirectedToOriginal(context);
     return std::make_unique<IncognitoProcessManager>(context, original_context,
                                                      extension_registry);
   }
@@ -1188,7 +1188,7 @@ IncognitoProcessManager::GetSiteInstanceForURL(const GURL& url) {
   if (extension && !IncognitoInfo::IsSplitMode(extension)) {
     BrowserContext* original_context =
         ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-            browser_context(), /*force_guest_profile=*/true);
+            browser_context());
     return ProcessManager::Get(original_context)->GetSiteInstanceForURL(url);
   }
 

extensions/browser/process_manager_factory.cc

@@ -54,8 +54,7 @@ BrowserContext* ProcessManagerFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // ProcessManager::Create handles guest and incognito profiles, returning an
   // IncognitoProcessManager in incognito mode.
-  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-      context, /*force_guest_profile=*/true);
 }
 
 }  // namespace extensions

extensions/browser/process_map_factory.cc

@@ -47,7 +47,7 @@ BrowserContext* ProcessMapFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/browser/renderer_startup_helper.cc

@@ -637,7 +637,7 @@ BrowserContext* RendererStartupHelperFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 bool RendererStartupHelperFactory::ServiceIsCreatedWithBrowserContext() const {

extensions/browser/service_worker/service_worker_keepalive.cc

@@ -46,8 +46,7 @@ class ServiceWorkerKeepaliveShutdownNotifierFactory
   // Use whichever profile is associated with the Keepalive.
   content::BrowserContext* GetBrowserContextToUse(
       content::BrowserContext* context) const override {
-    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+    return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-        context, /*force_guest_profile=*/true);
   }
 };
 

extensions/browser/service_worker/service_worker_task_queue_factory.cc

@@ -52,8 +52,7 @@ ServiceWorkerTaskQueueFactory::BuildServiceInstanceForBrowserContext(
     task_queue = std::make_unique<ServiceWorkerTaskQueue>(context);
   }
   BrowserContext* original_context =
-      ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
+      ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(context);
-          context, /*force_guest_profile=*/true);
   if (original_context != context) {
     // To let incognito context's ServiceWorkerTaskQueue know about extensions
     // that were activated (which has its own instance of
@@ -67,8 +66,7 @@ ServiceWorkerTaskQueueFactory::BuildServiceInstanceForBrowserContext(
 
 BrowserContext* ServiceWorkerTaskQueueFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(
+  return ExtensionsBrowserClient::Get()->GetContextOwnInstance(context);
-      context, /*force_guest_profile=*/true);
 }
 
 }  // namespace extensions

extensions/browser/test_extensions_browser_client.cc

@@ -104,20 +104,17 @@ BrowserContext* TestExtensionsBrowserClient::GetOriginalContext(
 
 content::BrowserContext*
 TestExtensionsBrowserClient::GetContextRedirectedToOriginal(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return GetOriginalContext(context);
 }
 
 content::BrowserContext* TestExtensionsBrowserClient::GetContextOwnInstance(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 
 content::BrowserContext* TestExtensionsBrowserClient::GetContextForOriginalOnly(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   // Default implementation of
   // `BrowserContextKeyedServiceFactory::GetBrowserContextToUse()`.
   return context->IsOffTheRecord() ? nullptr : context;

extensions/browser/test_extensions_browser_client.h

@@ -81,19 +81,14 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
       content::BrowserContext* context) override;
   content::BrowserContext* GetOriginalContext(
       content::BrowserContext* context) override;
-
   content::BrowserContext* GetContextRedirectedToOriginal(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextOwnInstance(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextForOriginalOnly(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   bool AreExtensionsDisabledForContext(
       content::BrowserContext* context) override;
-
 #if BUILDFLAG(IS_CHROMEOS)
   std::string GetUserIdHashFromContext(
       content::BrowserContext* context) override;
@@ -116,7 +111,6 @@ class TestExtensionsBrowserClient : public ExtensionsBrowserClient {
       int resource_id,
       scoped_refptr<net::HttpResponseHeaders> headers,
       mojo::PendingRemote<network::mojom::URLLoaderClient> client) override;
-
   bool AllowCrossRendererResourceLoad(
       const network::ResourceRequest& request,
       network::mojom::RequestDestination destination,

extensions/browser/updater/update_service_factory.cc

@@ -43,8 +43,7 @@ UpdateServiceFactory::BuildServiceInstanceForBrowserContext(
 
 content::BrowserContext* UpdateServiceFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetContextForOriginalOnly(
+  return ExtensionsBrowserClient::Get()->GetContextForOriginalOnly(context);
-      context, /*force_guest_profile=*/true);
 }
 
 }  // namespace extensions

extensions/browser/user_script_world_configuration_manager.cc

@@ -53,7 +53,7 @@ class UserScriptWorldConfigurationManagerFactory
     // incognito-only world specifications and have them cleaned up when the
     // profile is destroyed.
     return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-        context, /*force_guest_profile=*/true);
+        context);
   }
   KeyedService* BuildServiceInstanceFor(
       content::BrowserContext* context) const override {

extensions/browser/warning_service.cc

@@ -21,7 +21,7 @@ WarningService::WarningService(content::BrowserContext* browser_context)
   if (browser_context_) {
     extension_registry_observation_.Observe(ExtensionRegistry::Get(
         ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-            browser_context_, /*force_guest_profile=*/true)));
+            browser_context_)));
   }
 }
 

extensions/browser/warning_service_factory.cc

@@ -45,7 +45,7 @@ BrowserContext* WarningServiceFactory::GetBrowserContextToUse(
     BrowserContext* context) const {
   // Redirected in incognito.
   return ExtensionsBrowserClient::Get()->GetContextRedirectedToOriginal(
-      context, /*force_guest_profile=*/true);
+      context);
 }
 
 }  // namespace extensions

extensions/shell/browser/shell_extensions_browser_client.cc

@@ -95,21 +95,18 @@ BrowserContext* ShellExtensionsBrowserClient::GetOriginalContext(
 
 content::BrowserContext*
 ShellExtensionsBrowserClient::GetContextRedirectedToOriginal(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 
 content::BrowserContext* ShellExtensionsBrowserClient::GetContextOwnInstance(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 
 content::BrowserContext*
 ShellExtensionsBrowserClient::GetContextForOriginalOnly(
-    content::BrowserContext* context,
+    content::BrowserContext* context) {
-    bool force_guest_profile) {
   return context;
 }
 

extensions/shell/browser/shell_extensions_browser_client.h

@@ -50,19 +50,14 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient {
       content::BrowserContext* context) override;
   content::BrowserContext* GetOriginalContext(
       content::BrowserContext* context) override;
-
   content::BrowserContext* GetContextRedirectedToOriginal(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextOwnInstance(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   content::BrowserContext* GetContextForOriginalOnly(
-      content::BrowserContext* context,
+      content::BrowserContext* context) override;
-      bool force_guest_profile) override;
   bool AreExtensionsDisabledForContext(
       content::BrowserContext* context) override;
-
 #if BUILDFLAG(IS_CHROMEOS)
   std::string GetUserIdHashFromContext(
       content::BrowserContext* context) override;