Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_keyed_service_factory.cc

Index: components/keyed_service/content/browser_context_keyed_service_factory.cc
diff --git a/components/keyed_service/content/browser_context_keyed_service_factory.cc b/components/keyed_service/content/browser_context_keyed_service_factory.cc
index 1c61c502c61d75d0a76a3a0addbbc9b97b16aec6..849cdc049cc6685e826c2e5740802d56f380a49d 100644
--- a/components/keyed_service/content/browser_context_keyed_service_factory.cc
+++ b/components/keyed_service/content/browser_context_keyed_service_factory.cc
@@ -5,7 +5,6 @@
 #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"
@@ -97,14 +96,16 @@ bool BrowserContextKeyedServiceFactory::IsOffTheRecord(
   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(