| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index 0a35b7f56762abe5ab8488b2f06824e290cac05e..3595164738064bcd2b47f965c4cfbbfc67ad7ccf 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -213,7 +213,8 @@ class TestingProfile : public Profile {
|
| GetDownloadManagerDelegate() OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
|
| virtual net::URLRequestContextGetter* CreateRequestContext(
|
| - content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
|
| virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
|
| int renderer_child_id) OVERRIDE;
|
| virtual content::ResourceContext* GetResourceContext() OVERRIDE;
|
| @@ -296,7 +297,8 @@ class TestingProfile : public Profile {
|
| virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory,
|
| - content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
|
| virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
|
| virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
|
| virtual std::wstring GetName();
|
|
|