Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_keyed_base_factory.h

Index: components/keyed_service/content/browser_context_keyed_base_factory.h
diff --git a/components/keyed_service/content/browser_context_keyed_base_factory.h b/components/keyed_service/content/browser_context_keyed_base_factory.h
index f747cac590a6c741bc6337eb6f40f59d00c67710..eb036a0ff3e1d9d5f290c29e9782a441fcff28bc 100644
--- a/components/keyed_service/content/browser_context_keyed_base_factory.h
+++ b/components/keyed_service/content/browser_context_keyed_base_factory.h
@@ -90,7 +90,7 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedBaseFactory
 
  private:
   // Registers any user preferences on this service. This is called by
-  // RegisterProfilePrefsIfNecessary() and should be overriden by any service
+  // RegisterPrefsIfNecessaryForContext() and should be overriden by any service
   // that wants to register profile-specific preferences.
   virtual void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) {}
@@ -107,8 +107,10 @@ class KEYED_SERVICE_EXPORT BrowserContextKeyedBaseFactory
   virtual void CreateServiceNow(content::BrowserContext* context) = 0;
 
   // KeyedServiceBaseFactory:
-  user_prefs::PrefRegistrySyncable* GetAssociatedPrefRegistry(
-      base::SupportsUserData* context) const final;
+  base::SupportsUserData* GetUnderlyingContextInternal(
+      base::SupportsUserData* context) const override;
+  base::SupportsUserData* GetOriginalContextInternal(
+      base::SupportsUserData* context) const override;
   base::SupportsUserData* GetContextToUse(
       base::SupportsUserData* context) const final;
   bool ServiceIsCreatedWithContext() const final;