Move ownership of ChromeBrowserStateManager to ApplicationContext.

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 39 matching lines @@
 #include "ios/chrome/common/channel_info.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/public/provider/chrome/browser/browser_state/chrome_browser_state_manager.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/web/public/web_thread.h"
 #include "net/log/net_log_capture_mode.h"
 #include "net/socket/client_socket_pool_manager.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace {
-
 // Dummy flag because iOS does not support disabling background networking.
 extern const char kDummyDisableBackgroundNetworking[] =
     "dummy-disable-background-networking";
-
 }
 
 ApplicationContextImpl::ApplicationContextImpl(
     base::SequencedTaskRunner* local_state_task_runner,
     const base::CommandLine& command_line,
     const std::string& locale)
     : local_state_task_runner_(local_state_task_runner),
       was_last_shutdown_clean_(false),
       created_local_state_(false) {
   DCHECK(!GetApplicationContext());
@@ skipping 53 matching lines @@
   // SafeBrowsing before the IO thread gets destroyed, since their destructors
   // can call the URLFetcher destructor, which does a PostDelayedTask operation
   // on the IO thread. (The IO thread will handle that URLFetcher operation
   // before going away.)
   if (safe_browsing_service_)
     safe_browsing_service_->ShutDown();
 
   metrics_services_manager_.reset();
 
   // Need to clear browser states before the IO thread.
-  // TODO(crbug.com/560854): the ShutDown() method can be folded into the
-  // destructor once ApplicationContextImpl owns ChromeBrowserStateManager.
-  GetChromeBrowserStateManager()->ShutDown();
+  if (chrome_browser_state_manager_) {
+    // TODO(crbug.com/560854): the ShutDown() method can be folded into the
+    // destructor once ApplicationContextImpl owns ChromeBrowserStateManager.
+    chrome_browser_state_manager_->ShutDown();
+    chrome_browser_state_manager_.reset();
+  }
 
   // PromoResourceService must be destroyed after the keyed services and before
   // the IO thread.
   promo_resource_service_.reset();
 
   // The GCMDriver must shut down while the IO thread is still alive.
   if (gcm_driver_)
     gcm_driver_->Shutdown();
 
   if (local_state_) {
@@ skipping 82 matching lines @@
 
 const std::string& ApplicationContextImpl::GetApplicationLocale() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!application_locale_.empty());
   return application_locale_;
 }
 
 ios::ChromeBrowserStateManager*
 ApplicationContextImpl::GetChromeBrowserStateManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  return ios::GetChromeBrowserProvider()->GetChromeBrowserStateManager();
+  if (!chrome_browser_state_manager_) {
+    chrome_browser_state_manager_ =
+        ios::GetChromeBrowserProvider()->CreateChromeBrowserStateManager();
+    DCHECK(chrome_browser_state_manager_.get());
+  }
+  return chrome_browser_state_manager_.get();
 }
 
 metrics_services_manager::MetricsServicesManager*
 ApplicationContextImpl::GetMetricsServicesManager() {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!metrics_services_manager_) {
     metrics_services_manager_.reset(
         new metrics_services_manager::MetricsServicesManager(make_scoped_ptr(
             new IOSChromeMetricsServicesManagerClient(GetLocalState()))));
   }
@@ skipping 130 matching lines @@
           worker_pool->GetSequenceToken(),
           base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
 
   gcm_driver_ = gcm::CreateGCMDriverDesktop(
       make_scoped_ptr(new gcm::GCMClientFactory), GetLocalState(), store_path,
       GetSystemURLRequestContext(), ::GetChannel(),
       web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
       web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
       blocking_task_runner);
 }