summaryrefslogtreecommitdiffstats
path: root/chrome/browser/profiles/profile_impl_io_data.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/profiles/profile_impl_io_data.cc')
-rw-r--r--chrome/browser/profiles/profile_impl_io_data.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
index 3481fda..0b01f29 100644
--- a/chrome/browser/profiles/profile_impl_io_data.cc
+++ b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -223,6 +223,9 @@ void ProfileImplIOData::Handle::ClearNetworkingHistorySince(
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(
@@ -240,7 +243,6 @@ void ProfileImplIOData::Handle::LazyInitialize() const {
pref_service, NULL);
io_data_->safe_browsing_enabled()->MoveToThread(BrowserThread::IO);
#endif
- initialized_ = true;
}
}