Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/ios/browser_state_keyed_service_factory.h

Index: components/keyed_service/ios/browser_state_keyed_service_factory.h
diff --git a/components/keyed_service/ios/browser_state_keyed_service_factory.h b/components/keyed_service/ios/browser_state_keyed_service_factory.h
index 9f3d366414116fcfd6195d066e9677110cc1ee44..42935d06c409653ba923255dd571b343e14b6244 100644
--- a/components/keyed_service/ios/browser_state_keyed_service_factory.h
+++ b/components/keyed_service/ios/browser_state_keyed_service_factory.h
@@ -108,9 +108,9 @@ class KEYED_SERVICE_EXPORT BrowserStateKeyedServiceFactory
 
  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) {}
 
   // KeyedServiceFactory:
@@ -119,8 +119,10 @@ class KEYED_SERVICE_EXPORT BrowserStateKeyedServiceFactory
   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;