[iOS] Unfork ChromeBrowserStateManager

ios/chrome/browser/sync/glue/sync_start_util.cc

 // Copyright 2015 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 "ios/chrome/browser/sync/glue/sync_start_util.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "components/sync_driver/sync_service.h"
@@ skipping 10 matching lines @@
                          syncer::ModelType type) {
   ios::ChromeBrowserStateManager* browser_state_manager =
       GetApplicationContext()->GetChromeBrowserStateManager();
   if (!browser_state_manager) {
     // Can happen in tests.
     DVLOG(2) << "No ChromeBrowserStateManager, can't start sync.";
     return;
   }
 
   ios::ChromeBrowserState* browser_state =
-      browser_state_manager->GetChromeBrowserState(browser_state_path);
+      browser_state_manager->GetBrowserState(browser_state_path);
   if (!browser_state) {
     DVLOG(2) << "ChromeBrowserState not found, can't start sync.";
     return;
   }
 
   sync_driver::SyncService* sync_service =
       ios::GetKeyedServiceProvider()->GetSyncServiceForBrowserState(
           browser_state);
   if (!sync_service) {
     DVLOG(2) << "No SyncService for browser state, can't start sync.";
@@ skipping 13 matching lines @@
 
 namespace sync_start_util {
 
 syncer::SyncableService::StartSyncFlare GetFlareForSyncableService(
     const base::FilePath& browser_state_path) {
   return base::Bind(&StartSyncProxy, browser_state_path);
 }
 
 }  // namespace sync_start_util
 }  // namespace ios