| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index e23498d65a24a68b0b9561a758af6a19a4974d5f..995781589342c7a2258abac51e4e4b7691c04f46 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -817,22 +817,9 @@ base::FilePath ProfileImpl::GetPrefFilePath() {
|
| }
|
|
|
| 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::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) {
|
| + content::ProtocolHandlerMap* protocol_handlers) {
|
| return io_data_.CreateMainRequestContextGetter(
|
| - blob_protocol_handler.Pass(),
|
| - file_system_protocol_handler.Pass(),
|
| - developer_protocol_handler.Pass(),
|
| - chrome_protocol_handler.Pass(),
|
| - chrome_devtools_protocol_handler.Pass(),
|
| + protocol_handlers,
|
| g_browser_process->local_state(),
|
| g_browser_process->io_thread());
|
| }
|
| @@ -884,20 +871,9 @@ net::URLRequestContextGetter*
|
| ProfileImpl::CreateRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - blob_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - file_system_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - developer_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_protocol_handler,
|
| - scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
|
| - chrome_devtools_protocol_handler) {
|
| + content::ProtocolHandlerMap* protocol_handlers) {
|
| return io_data_.CreateIsolatedAppRequestContextGetter(
|
| - partition_path, in_memory, blob_protocol_handler.Pass(),
|
| - file_system_protocol_handler.Pass(), developer_protocol_handler.Pass(),
|
| - chrome_protocol_handler.Pass(), chrome_devtools_protocol_handler.Pass());
|
| + partition_path, in_memory, protocol_handlers);
|
| }
|
|
|
| net::SSLConfigService* ProfileImpl::GetSSLConfigService() {
|
|
|