| Index: chrome/browser/profiles/profile_impl_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
|
| index 949f14e8a4257fa248c8391e36e3f3c184339d13..ccadce3be44a571a3d9adefa72b300a85c6d63c2 100644
|
| --- a/chrome/browser/profiles/profile_impl_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_impl_io_data.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #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"
|
| @@ -13,6 +14,7 @@
|
| #include "chrome/browser/net/chrome_network_delegate.h"
|
| #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
|
| #include "chrome/browser/prefs/pref_member.h"
|
| +#include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/pref_names.h"
|
| @@ -47,7 +49,7 @@ ProfileImplIOData::Handle::~Handle() {
|
| iter->second->CleanupOnUIThread();
|
| }
|
|
|
| - io_data_->ShutdownOnUIThread();
|
| + io_data_.release()->ShutdownOnUIThread();
|
| }
|
|
|
| void ProfileImplIOData::Handle::Init(const FilePath& cookie_path,
|
| @@ -74,6 +76,14 @@ void ProfileImplIOData::Handle::Init(const FilePath& cookie_path,
|
| io_data_->app_path_ = app_path;
|
| }
|
|
|
| +base::Callback<ChromeURLDataManagerBackend*(void)>
|
| +ProfileImplIOData::Handle::GetChromeURLDataManagerBackendGetter() const {
|
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| + LazyInitialize();
|
| + return base::Bind(&ProfileIOData::GetChromeURLDataManagerBackend,
|
| + base::Unretained(io_data_.get()));
|
| +}
|
| +
|
| const content::ResourceContext&
|
| ProfileImplIOData::Handle::GetResourceContext() const {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|