Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/content/browser_context_keyed_base_factory.h

 // 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.
 
 #ifndef COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_
 #define COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_
 
 #include "components/keyed_service/core/keyed_service_base_factory.h"
 #include "components/keyed_service/core/keyed_service_export.h"
 
@@ skipping 72 matching lines @@
   // - Each BrowserContextDestroyed() is called in dependency order. We will
   //   NOTREACHED() if you attempt to GetForBrowserContext() any other service.
   //   You should delete/deref/do other final memory management things during
   //   this phase. You must also call the base class method as the last thing
   //   you do.
   virtual void BrowserContextShutdown(content::BrowserContext* context) = 0;
   virtual void BrowserContextDestroyed(content::BrowserContext* context);
 
  private:
   // Registers any user preferences on this service. This is called by
-  // RegisterProfilePrefsIfNecessary() and should be overriden by any service
+  // RegisterPrefsIfNecessaryForContext() and should be overriden by any service
   // that wants to register profile-specific preferences.
   virtual void RegisterProfilePrefs(
       user_prefs::PrefRegistrySyncable* registry) {}
 
   // Because of ServiceIsNULLWhileTesting(), we need a way to tell different
   // subclasses that they should disable testing.
   virtual void SetEmptyTestingFactory(content::BrowserContext* context) = 0;
 
   // Returns true if a testing factory function has been set for |context|.
   virtual bool HasTestingFactory(content::BrowserContext* context) = 0;
 
   // We also need a generalized, non-returning method that generates the object
   // now for when we're creating the context.
   virtual void CreateServiceNow(content::BrowserContext* context) = 0;
 
   // KeyedServiceBaseFactory:
-  user_prefs::PrefRegistrySyncable* GetAssociatedPrefRegistry(
-      base::SupportsUserData* context) const final;
+  base::SupportsUserData* GetUnderlyingContextInternal(
+      base::SupportsUserData* context) const override;
+  base::SupportsUserData* GetOriginalContextInternal(
+      base::SupportsUserData* context) const override;
   base::SupportsUserData* GetContextToUse(
       base::SupportsUserData* context) const final;
   bool ServiceIsCreatedWithContext() const final;
   void ContextShutdown(base::SupportsUserData* context) final;
   void ContextDestroyed(base::SupportsUserData* context) final;
   void RegisterPrefs(user_prefs::PrefRegistrySyncable* registry) final;
   void SetEmptyTestingFactory(base::SupportsUserData* context) final;
   bool HasTestingFactory(base::SupportsUserData* context) final;
   void CreateServiceNow(base::SupportsUserData* context) final;
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_CONTENT_BROWSER_CONTEXT_KEYED_BASE_FACTORY_H_