Chromium Code Reviews| Index: chrome/browser/profiles/profile_impl.cc |
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc |
| index 3fa025b8a4e5fb125a85c41b0ba1bab3a234e10d..527c60046b97547e1dc4c5ecebd1aa4533e4ece2 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,8 +787,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); |
|
awong
2013/01/19 00:43:42
Use BrowserContext::GetDefaultStoragePartition() i
pauljensen
2013/01/21 06:24:56
Your comment about that function is pretty inhibit
|
| + return storage_partition->GetURLRequestContext(); |
| } |
| net::URLRequestContextGetter* ProfileImpl::GetRequestContextForRenderProcess( |
| @@ -832,10 +847,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() { |