Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_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/content/browser_context_keyed_service_factory.h"
 
 #include "base/logging.h"
-#include "base/prefs/pref_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/keyed_service/core/keyed_service.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 
 void BrowserContextKeyedServiceFactory::SetTestingFactory(
     content::BrowserContext* context,
     TestingFactoryFunction testing_factory) {
   KeyedServiceFactory::SetTestingFactory(
@@ skipping 71 matching lines @@
     base::SupportsUserData* context) const {
   return BuildServiceInstanceFor(
       static_cast<content::BrowserContext*>(context));
 }
 
 bool BrowserContextKeyedServiceFactory::IsOffTheRecord(
     base::SupportsUserData* context) const {
   return static_cast<content::BrowserContext*>(context)->IsOffTheRecord();
 }
 
-user_prefs::PrefRegistrySyncable*
-BrowserContextKeyedServiceFactory::GetAssociatedPrefRegistry(
+base::SupportsUserData*
+BrowserContextKeyedServiceFactory::GetUnderlyingContextInternal(
     base::SupportsUserData* context) const {
-  PrefService* prefs = user_prefs::UserPrefs::Get(context);
-  user_prefs::PrefRegistrySyncable* registry =
-      static_cast<user_prefs::PrefRegistrySyncable*>(
-          prefs->DeprecatedGetPrefRegistry());
-  return registry;
+  return context;
+}
+
+base::SupportsUserData*
+BrowserContextKeyedServiceFactory::GetOriginalContextInternal(
+    base::SupportsUserData* context) const {
+  return context;
 }
 
 base::SupportsUserData* BrowserContextKeyedServiceFactory::GetContextToUse(
     base::SupportsUserData* context) const {
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }
 
 bool BrowserContextKeyedServiceFactory::ServiceIsCreatedWithContext() const {
   return ServiceIsCreatedWithBrowserContext();
 }
 
 void BrowserContextKeyedServiceFactory::ContextShutdown(
     base::SupportsUserData* context) {
   BrowserContextShutdown(static_cast<content::BrowserContext*>(context));
 }
 
 void BrowserContextKeyedServiceFactory::ContextDestroyed(
     base::SupportsUserData* context) {
   BrowserContextDestroyed(static_cast<content::BrowserContext*>(context));
 }
 
 void BrowserContextKeyedServiceFactory::RegisterPrefs(
     user_prefs::PrefRegistrySyncable* registry) {
   RegisterProfilePrefs(registry);
 }