| Index: chrome/test/base/testing_profile.h
|
| diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
|
| index daab7ac91ed1d2fba066fc42576db32d4e04eac8..f42fb81832f4b356749b8650d5a57ae575632730 100644
|
| --- a/chrome/test/base/testing_profile.h
|
| +++ b/chrome/test/base/testing_profile.h
|
| @@ -223,9 +223,6 @@ class TestingProfile : public Profile {
|
| bool IsOffTheRecord() const override;
|
| content::DownloadManagerDelegate* GetDownloadManagerDelegate() override;
|
| net::URLRequestContextGetter* GetRequestContext() override;
|
| - net::URLRequestContextGetter* CreateRequestContext(
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector request_interceptors) override;
|
| content::ResourceContext* GetResourceContext() override;
|
| content::BrowserPluginGuestManager* GetGuestManager() override;
|
| storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
|
| @@ -233,6 +230,14 @@ class TestingProfile : public Profile {
|
| content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
|
| content::PermissionManager* GetPermissionManager() override;
|
| content::BackgroundSyncController* GetBackgroundSyncController() override;
|
| + net::URLRequestContextGetter* CreateRequestContext(
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) override;
|
| + net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| + const base::FilePath& partition_path,
|
| + bool in_memory,
|
| + content::ProtocolHandlerMap* protocol_handlers,
|
| + content::URLRequestInterceptorScopedVector request_interceptors) override;
|
|
|
| TestingProfile* AsTestingProfile() override;
|
|
|
| @@ -285,11 +290,6 @@ class TestingProfile : public Profile {
|
| net::URLRequestContextGetter* GetMediaRequestContextForStoragePartition(
|
| const base::FilePath& partition_path,
|
| bool in_memory) override;
|
| - net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
|
| - const base::FilePath& partition_path,
|
| - bool in_memory,
|
| - content::ProtocolHandlerMap* protocol_handlers,
|
| - content::URLRequestInterceptorScopedVector request_interceptors) override;
|
| net::SSLConfigService* GetSSLConfigService() override;
|
| void set_last_session_exited_cleanly(bool value) {
|
| last_session_exited_cleanly_ = value;
|
|
|