| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| ===================================================================
|
| --- chrome/browser/profiles/profile_impl_io_data.cc (revision 122416)
|
| +++ chrome/browser/profiles/profile_impl_io_data.cc (working copy)
|
| @@ -223,6 +223,9 @@
|
|
|
| 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(
|
| @@ -237,7 +240,6 @@
|
| pref_service, NULL);
|
| io_data_->safe_browsing_enabled()->MoveToThread(BrowserThread::IO);
|
| #endif
|
| - initialized_ = true;
|
| }
|
| }
|
|
|
|
|