Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_keyed_base_factory.cc

Index: components/keyed_service/content/browser_context_keyed_base_factory.cc
diff --git a/components/keyed_service/content/browser_context_keyed_base_factory.cc b/components/keyed_service/content/browser_context_keyed_base_factory.cc
index d09ea4af47c49e10cc91b1026e3382dd276905bf..71ec7baeab9c064e96c97c64c8db435fd80d152f 100644
--- a/components/keyed_service/content/browser_context_keyed_base_factory.cc
+++ b/components/keyed_service/content/browser_context_keyed_base_factory.cc
@@ -4,10 +4,7 @@
 
 #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(
@@ -53,14 +50,16 @@ void BrowserContextKeyedBaseFactory::BrowserContextDestroyed(
   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(