Move creation of BrowserContext objects that live in content to content, instead of depending on th…

chrome/browser/profiles/profile_impl_io_data.cc

 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_impl_io_data.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
@@ skipping 205 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &ClearNetworkingHistorySinceOnIOThread,
           io_data_,
           time));
 }
 
 void ProfileImplIOData::Handle::LazyInitialize() const {
   if (!initialized_) {
+    // Set initialized_ to true at the beginning in case any of the objects
+    // below try to get the ResourceContext pointer.
+    initialized_ = true;
     io_data_->InitializeOnUIThread(profile_);
     PrefService* pref_service = profile_->GetPrefs();
     io_data_->http_server_properties_manager_.reset(
         new chrome_browser_net::HttpServerPropertiesManager(pref_service));
     ChromeNetworkDelegate::InitializeReferrersEnabled(
         io_data_->enable_referrers(), pref_service);
     io_data_->clear_local_state_on_exit()->Init(
         prefs::kClearSiteDataOnExit, pref_service, NULL);
     io_data_->clear_local_state_on_exit()->MoveToThread(BrowserThread::IO);
 #if defined(ENABLE_SAFE_BROWSING)
     io_data_->safe_browsing_enabled()->Init(prefs::kSafeBrowsingEnabled,
         pref_service, NULL);
     io_data_->safe_browsing_enabled()->MoveToThread(BrowserThread::IO);
 #endif
-    initialized_ = true;
   }
 }
 
 ProfileImplIOData::LazyParams::LazyParams()
     : cache_max_size(0),
       media_cache_max_size(0) {}
 ProfileImplIOData::LazyParams::~LazyParams() {}
 
 ProfileImplIOData::ProfileImplIOData()
     : ProfileIOData(false),
@@ skipping 253 matching lines @@
 scoped_refptr<ChromeURLRequestContext>
 ProfileImplIOData::AcquireIsolatedAppRequestContext(
     scoped_refptr<ChromeURLRequestContext> main_context,
     const std::string& app_id) const {
   // We create per-app contexts on demand, unlike the others above.
   scoped_refptr<ChromeURLRequestContext> app_request_context =
       InitializeAppRequestContext(main_context, app_id);
   DCHECK(app_request_context);
   return app_request_context;
 }