Allow cross dependencies between BCKSF and BSKSF

components/keyed_service/ios/browser_state_dependency_manager.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_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_
 #define COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/callback_list.h"
 #include "base/macros.h"
@@ skipping 16 matching lines @@
 // based on the stated dependencies by each service.
 class KEYED_SERVICE_EXPORT BrowserStateDependencyManager
     : public DependencyManager {
  public:
   static BrowserStateDependencyManager* GetInstance();
 
   // Registers context-specific preferences for all services via |registry|.
   // |context| should be the BrowserState containing |registry| and is used as
   // a key to prevent multiple registrations on the same BrowserState in
   // tests.
-  void RegisterProfilePrefsForServices(
-      const web::BrowserState* context,
+  void RegisterBrowserStatePrefsForServices(
+      web::BrowserState* context,
       user_prefs::PrefRegistrySyncable* registry);
 
   // Called by each BrowserState to alert us of its creation. Service that
   // want to be started when BrowserState is created should override the
   // ServiceIsCreatedWithBrowserState() method in their factory. Preferences
   // registration also happens during that method call.
   void CreateBrowserStateServices(web::BrowserState* context);
 
   // Similar to CreateBrowserStateServices(), except this is used for creating
   // test BrowserStates - these contexts will not create services for any
@@ skipping 24 matching lines @@
 
   BrowserStateDependencyManager();
   ~BrowserStateDependencyManager() override;
 
   // Helper function used by CreateBrowserStateServices[ForTest].
   void DoCreateBrowserStateServices(web::BrowserState* context,
                                     bool is_testing_context);
 
 #ifndef NDEBUG
   // DependencyManager:
-  void DumpContextDependencies(
-      const base::SupportsUserData* context) const final;
+  void DumpContextDependencies(base::SupportsUserData* context) const final;
 #endif  // NDEBUG
 
   DISALLOW_COPY_AND_ASSIGN(BrowserStateDependencyManager);
 };
 
 #endif  // COMPONENTS_KEYED_SERVICE_IOS_BROWSER_STATE_DEPENDENCY_MANAGER_H_