[iOS] Unfork ChromeBrowserStateManager

ios/chrome/browser/application_context_impl.cc

 // 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.
 
 #include "ios/chrome/browser/application_context_impl.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 69 matching lines @@
   if (metrics_service && local_state) {
     metrics_service->OnAppEnterForeground();
     local_state->CommitPendingWrite();
   }
 
   variations::VariationsService* variations_service = GetVariationsService();
   if (variations_service)
     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);
   }
 }
 
 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(
                 browser_state, ServiceAccessType::EXPLICIT_ACCESS)) {
       history_service->HandleBackgrounding();
     }
 
     browser_state->SetExitType(ios::ChromeBrowserState::EXIT_NORMAL);
     PrefService* browser_state_prefs = browser_state->GetPrefs();
     if (browser_state_prefs)
@@ skipping 96 matching lines @@
       std::max(std::min(max_per_proxy, 99),
                net::ClientSocketPoolManager::max_sockets_per_group(
                    net::HttpNetworkSession::NORMAL_SOCKET_POOL)));
 
   // Register the shutdown state before anything changes it.
   if (local_state_->HasPrefPath(prefs::kLastSessionExitedCleanly)) {
     was_last_shutdown_clean_ =
         local_state_->GetBoolean(prefs::kLastSessionExitedCleanly);
   }
 }