Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/keyed_service/ios/refcounted_browser_state_keyed_service_factory.h"
 
 #include "base/logging.h"
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
 #include "components/keyed_service/ios/browser_state_helper.h"
@@ skipping 68 matching lines @@
 }
 
 void RefcountedBrowserStateKeyedServiceFactory::BrowserStateDestroyed(
     web::BrowserState* context) {
   RefcountedKeyedServiceFactory::ContextDestroyed(context);
 }
 
 scoped_refptr<RefcountedKeyedService>
 RefcountedBrowserStateKeyedServiceFactory::BuildServiceInstanceFor(
     base::SupportsUserData* context) const {
-  return BuildServiceInstanceFor(BrowserStateFromContext(context));
+  return BuildServiceInstanceFor(UnderlyingContextFromContext(context));
 }
 
 bool RefcountedBrowserStateKeyedServiceFactory::IsOffTheRecord(
     base::SupportsUserData* context) const {
-  return BrowserStateFromContext(context)->IsOffTheRecord();
+  return UnderlyingContextFromContext(context)->IsOffTheRecord();
 }
 
-user_prefs::PrefRegistrySyncable*
-RefcountedBrowserStateKeyedServiceFactory::GetAssociatedPrefRegistry(
+base::SupportsUserData*
+RefcountedBrowserStateKeyedServiceFactory::GetUnderlyingContextInternal(
     base::SupportsUserData* context) const {
-  NOTREACHED();
-  return nullptr;
+  return UnderlyingContextFromContext(context);
+}
+
+base::SupportsUserData*
+RefcountedBrowserStateKeyedServiceFactory::GetOriginalContextInternal(
+    base::SupportsUserData* context) const {
+  return OriginalContextFromContext(context);
 }
 
 base::SupportsUserData*
 RefcountedBrowserStateKeyedServiceFactory::GetContextToUse(
     base::SupportsUserData* context) const {
-  return GetBrowserStateToUse(BrowserStateFromContext(context));
+  return GetBrowserStateToUse(UnderlyingContextFromContext(context));
 }
 
 bool RefcountedBrowserStateKeyedServiceFactory::ServiceIsCreatedWithContext()
     const {
   return ServiceIsCreatedWithBrowserState();
 }
 
 void RefcountedBrowserStateKeyedServiceFactory::ContextShutdown(
     base::SupportsUserData* context) {
-  BrowserStateShutdown(BrowserStateFromContext(context));
+  BrowserStateShutdown(UnderlyingContextFromContext(context));
 }
 
 void RefcountedBrowserStateKeyedServiceFactory::ContextDestroyed(
     base::SupportsUserData* context) {
-  BrowserStateDestroyed(BrowserStateFromContext(context));
+  BrowserStateDestroyed(UnderlyingContextFromContext(context));
 }
 
 void RefcountedBrowserStateKeyedServiceFactory::RegisterPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
-  RegisterProfilePrefs(registry);
+  RegisterBrowserStatePrefs(registry);
 }