| Index: chrome/browser/profiles/profile_impl_io_data.h
 | 
| diff --git a/chrome/browser/profiles/profile_impl_io_data.h b/chrome/browser/profiles/profile_impl_io_data.h
 | 
| index 670d3b76c24ca81771cb7388f262fd5b99adff07..8fa27a7c9006b95b8a12496f3cdafc8a3114e98d 100644
 | 
| --- a/chrome/browser/profiles/profile_impl_io_data.h
 | 
| +++ b/chrome/browser/profiles/profile_impl_io_data.h
 | 
| @@ -54,32 +54,14 @@ class ProfileImplIOData : public ProfileIOData {
 | 
|      // these functions.
 | 
|      scoped_refptr<ChromeURLRequestContextGetter>
 | 
|          CreateMainRequestContextGetter(
 | 
| -            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,
 | 
|              PrefService* local_state,
 | 
|              IOThread* io_thread) const;
 | 
|      scoped_refptr<ChromeURLRequestContextGetter>
 | 
|          CreateIsolatedAppRequestContextGetter(
 | 
|              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) const;
 | 
| +            content::ProtocolHandlerMap* protocol_handlers) const;
 | 
|  
 | 
|      content::ResourceContext* GetResourceContext() const;
 | 
|      // GetResourceContextNoInit() does not call LazyInitialize() so it can be
 | 
| @@ -166,16 +148,7 @@ class ProfileImplIOData : public ProfileIOData {
 | 
|  
 | 
|    virtual void InitializeInternal(
 | 
|        ProfileParams* profile_params,
 | 
| -      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) const OVERRIDE;
 | 
| +      content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
 | 
|    virtual void InitializeExtensionsRequestContext(
 | 
|        ProfileParams* profile_params) const OVERRIDE;
 | 
|    virtual ChromeURLRequestContext* InitializeAppRequestContext(
 | 
| @@ -183,16 +156,7 @@ class ProfileImplIOData : public ProfileIOData {
 | 
|        const StoragePartitionDescriptor& partition_descriptor,
 | 
|        scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
 | 
|            protocol_handler_interceptor,
 | 
| -      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) const OVERRIDE;
 | 
| +      content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
 | 
|    virtual ChromeURLRequestContext* InitializeMediaRequestContext(
 | 
|        ChromeURLRequestContext* original_context,
 | 
|        const StoragePartitionDescriptor& partition_descriptor) const OVERRIDE;
 | 
| @@ -204,16 +168,7 @@ class ProfileImplIOData : public ProfileIOData {
 | 
|            const StoragePartitionDescriptor& partition_descriptor,
 | 
|            scoped_ptr<ProtocolHandlerRegistry::JobInterceptorFactory>
 | 
|                protocol_handler_interceptor,
 | 
| -          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) const OVERRIDE;
 | 
| +          content::ProtocolHandlerMap* protocol_handlers) const OVERRIDE;
 | 
|    virtual ChromeURLRequestContext*
 | 
|        AcquireIsolatedMediaRequestContext(
 | 
|            ChromeURLRequestContext* app_context,
 | 
| 
 |