Index: chrome/browser/profiles/profile_impl.cc |
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
index f6c9367070353eef0747e2c260329de83dc36641..fe82133ac2aa834f0621fc65e49153116dfc3b2d 100644 |
--- a/chrome/browser/profiles/profile_impl.cc |
+++ b/chrome/browser/profiles/profile_impl.cc |
@@ -503,8 +503,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()); |
@@ -789,6 +787,21 @@ 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(); |
mmenke
2013/01/08 17:19:26
Now that we're separating out creation from initia
awong
2013/01/16 21:31:50
At a surface level, this sounds fine to me. I thin
mmenke
2013/01/16 23:40:36
My understanding from what you said earlier is tha
mmenke
2013/01/16 23:45:28
Oh, and while I agree it's a little circular, I th
pauljensen
2013/01/21 06:24:56
I adjusted GetRequestContext() as described. I co
|
} |
@@ -832,10 +845,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() { |