| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index 695e92e9f2c79145d89e436bcff37e1636172aaf..b379cffdd8c315602d56275f8b5af17ca6a68454 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -514,8 +514,6 @@ void ProfileImpl::DoFinalInit(bool is_new_profile) {
|
| cache_max_size, media_cache_path, media_cache_max_size,
|
| extensions_cookie_path, GetPath(), infinite_cache_path,
|
| predictor_,
|
| - g_browser_process->local_state(),
|
| - g_browser_process->io_thread(),
|
| restore_old_session_cookies,
|
| GetSpecialStoragePolicy());
|
|
|
| @@ -800,8 +798,25 @@ FilePath ProfileImpl::GetPrefFilePath() {
|
| return pref_file_path;
|
| }
|
|
|
| +net::URLRequestContextGetter* ProfileImpl::CreateRequestContext(
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + blob_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + file_system_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| + developer_protocol_handler) {
|
| + return io_data_.CreateMainRequestContextGetter(
|
| + blob_protocol_handler.Pass(),
|
| + file_system_protocol_handler.Pass(),
|
| + developer_protocol_handler.Pass(),
|
| + g_browser_process->local_state(),
|
| + g_browser_process->io_thread());
|
| +}
|
| +
|
| net::URLRequestContextGetter* ProfileImpl::GetRequestContext() {
|
| - return io_data_.GetMainRequestContextGetter();
|
| + content::StoragePartition* storage_partition =
|
| + BrowserContext::GetStoragePartition(this, NULL);
|
| + return storage_partition->GetURLRequestContext();
|
| }
|
|
|
| net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess(
|
| @@ -843,10 +858,19 @@ net::URLRequestContextGetter* ProfileImpl::GetRequestContextForExtensions() {
|
| return io_data_.GetExtensionsRequestContextGetter();
|
| }
|
|
|
| -net::URLRequestContextGetter* ProfileImpl::GetRequestContextForStoragePartition(
|
| +net::URLRequestContextGetter*
|
| +ProfileImpl::CreateRequestContextForStoragePartition(
|
| const FilePath& partition_path,
|
| - bool in_memory) {
|
| - return io_data_.GetIsolatedAppRequestContextGetter(partition_path, in_memory);
|
| + bool in_memory,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + blob_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| + file_system_protocol_handler,
|
| + scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| + developer_protocol_handler) {
|
| + return io_data_.CreateIsolatedAppRequestContextGetter(
|
| + partition_path, in_memory, blob_protocol_handler.Pass(),
|
| + file_system_protocol_handler.Pass(), developer_protocol_handler.Pass());
|
| }
|
|
|
| net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
|
|
|