[iOS] Unfork ChromeBrowserStateManager

This CL renames the methods so that they are consistently using
"BrowserState" instead of a mix of "BrowserState" and
"ChromeBrowserState".

Review URL: https://codereview.chromium.org/1463833002

Cr-Commit-Position: refs/heads/master@{#361080}

ios/chrome/browser/application_context_impl.cc

@@ -87,7 +87,7 @@ void ApplicationContextImpl::OnAppEnterForeground() {
     variations_service->OnAppEnterForeground();
 
   std::vector<ios::ChromeBrowserState*> loaded_browser_state =
-      GetChromeBrowserStateManager()->GetLoadedChromeBrowserStates();
+      GetChromeBrowserStateManager()->GetLoadedBrowserStates();
   for (ios::ChromeBrowserState* browser_state : loaded_browser_state) {
     browser_state->SetExitType(ios::ChromeBrowserState::EXIT_CRASHED);
   }
@@ -97,7 +97,7 @@ void ApplicationContextImpl::OnAppEnterBackground() {
   DCHECK(thread_checker_.CalledOnValidThread());
   // Mark all the ChromeBrowserStates as clean and persist history.
   std::vector<ios::ChromeBrowserState*> loaded_browser_state =
-      GetChromeBrowserStateManager()->GetLoadedChromeBrowserStates();
+      GetChromeBrowserStateManager()->GetLoadedBrowserStates();
   for (ios::ChromeBrowserState* browser_state : loaded_browser_state) {
     if (history::HistoryService* history_service =
             ios::HistoryServiceFactory::GetForBrowserStateIfExists(

ios/chrome/browser/signin/ios_chrome_signin_status_metrics_provider_delegate.cc

@@ -74,5 +74,5 @@ std::vector<ios::ChromeBrowserState*>
 IOSChromeSigninStatusMetricsProviderDelegate::GetLoadedChromeBrowserStates() {
   return GetApplicationContext()
       ->GetChromeBrowserStateManager()
-      ->GetLoadedChromeBrowserStates();
+      ->GetLoadedBrowserStates();
 }

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

@@ -28,7 +28,7 @@ void StartSyncOnUIThread(const base::FilePath& browser_state_path,
   }
 
   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;

ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h

@@ -32,14 +32,13 @@ class ChromeBrowserStateManager {
 
   // Returns the ChromeBrowserState associated with |path|, creating one if
   // necessary.
-  virtual ChromeBrowserState* GetChromeBrowserState(
-      const base::FilePath& path) = 0;
+  virtual ChromeBrowserState* GetBrowserState(const base::FilePath& path) = 0;
 
   // Returns the BrowserStateInfoCache associated with this manager.
   virtual BrowserStateInfoCache* GetBrowserStateInfoCache() = 0;
 
   // Returns the list of loaded ChromeBrowserStates.
-  virtual std::vector<ChromeBrowserState*> GetLoadedChromeBrowserStates() = 0;
+  virtual std::vector<ChromeBrowserState*> GetLoadedBrowserStates() = 0;
 
  protected:
   ChromeBrowserStateManager() {}