Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_keyed_base_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_base_factory.h"
 
-#include "base/prefs/pref_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/pref_registry/pref_registry_syncable.h"
-#include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 
 BrowserContextKeyedBaseFactory::BrowserContextKeyedBaseFactory(
     const char* name,
     BrowserContextDependencyManager* manager)
     : KeyedServiceBaseFactory(name, manager) {
 }
 
 BrowserContextKeyedBaseFactory::~BrowserContextKeyedBaseFactory() {
 }
@@ skipping 25 matching lines @@
 
 bool BrowserContextKeyedBaseFactory::ServiceIsNULLWhileTesting() const {
   return KeyedServiceBaseFactory::ServiceIsNULLWhileTesting();
 }
 
 void BrowserContextKeyedBaseFactory::BrowserContextDestroyed(
     content::BrowserContext* context) {
   KeyedServiceBaseFactory::ContextDestroyed(context);
 }
 
-user_prefs::PrefRegistrySyncable*
-BrowserContextKeyedBaseFactory::GetAssociatedPrefRegistry(
+base::SupportsUserData*
+BrowserContextKeyedBaseFactory::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*
+BrowserContextKeyedBaseFactory::GetOriginalContextInternal(
+    base::SupportsUserData* context) const {
+  return context;
 }
 
 base::SupportsUserData* BrowserContextKeyedBaseFactory::GetContextToUse(
     base::SupportsUserData* context) const {
   return GetBrowserContextToUse(static_cast<content::BrowserContext*>(context));
 }
 
 bool BrowserContextKeyedBaseFactory::ServiceIsCreatedWithContext() const {
   return ServiceIsCreatedWithBrowserContext();
 }
@@ skipping 20 matching lines @@
 
 bool BrowserContextKeyedBaseFactory::HasTestingFactory(
     base::SupportsUserData* context) {
   return HasTestingFactory(static_cast<content::BrowserContext*>(context));
 }
 
 void BrowserContextKeyedBaseFactory::CreateServiceNow(
     base::SupportsUserData* context) {
   CreateServiceNow(static_cast<content::BrowserContext*>(context));
 }