Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h

Index: components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
diff --git a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
index fae4b53325a6c8471d6c746512489e2b41303a4b..f151183f84afc9020c25c43afda60b7bde558049 100644
--- a/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
+++ b/components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h
@@ -115,9 +115,9 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserStateKeyedServiceFactory
 
  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(
+  virtual void RegisterBrowserStatePrefs(
       user_prefs::PrefRegistrySyncable* registry) {}
 
   // RefcountedKeyedServiceFactory:
@@ -126,8 +126,10 @@ class KEYED_SERVICE_EXPORT RefcountedBrowserStateKeyedServiceFactory
   bool IsOffTheRecord(base::SupportsUserData* context) const final;
 
   // 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;