| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 88b048eb00149a776446c0aedbe10752b7c1b2c3..148b4688ad544e95176a8f1d6e2a77da24500f16 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -186,16 +186,7 @@ class TestingProfile : public Profile {
|
| // the CookieMonster. See implementation comments for more details.
|
| virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
|
| virtual net::URLRequestContextGetter* 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
|
| int renderer_child_id) OVERRIDE;
|
| virtual content::ResourceContext* GetResourceContext() OVERRIDE;
|
| @@ -251,16 +242,7 @@ class TestingProfile : public Profile {
|
| virtual net::URLRequestContextGetter* 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) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
|
| virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
|
| virtual std::wstring GetName();
|
|
|