Index: chrome/test/base/testing_profile.cc |
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc |
index 9d254cb49f3b89bf7cc65bc3a509c6f6920244e5..e759d74f590727a0b5e7b917723ebfa680211622 100644 |
--- a/chrome/test/base/testing_profile.cc |
+++ b/chrome/test/base/testing_profile.cc |
@@ -796,13 +796,6 @@ net::URLRequestContextGetter* TestingProfile::GetRequestContext() { |
return GetDefaultStoragePartition(this)->GetURLRequestContext(); |
} |
-net::URLRequestContextGetter* TestingProfile::CreateRequestContext( |
- content::ProtocolHandlerMap* protocol_handlers, |
- content::URLRequestInterceptorScopedVector request_interceptors) { |
- return new net::TestURLRequestContextGetter( |
- BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
-} |
- |
net::URLRequestContextGetter* TestingProfile::GetMediaRequestContext() { |
return NULL; |
} |
@@ -832,17 +825,6 @@ net::SSLConfigService* TestingProfile::GetSSLConfigService() { |
return GetRequestContext()->GetURLRequestContext()->ssl_config_service(); |
} |
-net::URLRequestContextGetter* |
-TestingProfile::CreateRequestContextForStoragePartition( |
- const base::FilePath& partition_path, |
- bool in_memory, |
- content::ProtocolHandlerMap* protocol_handlers, |
- content::URLRequestInterceptorScopedVector request_interceptors) { |
- // We don't test storage partitions here yet, so returning the same dummy |
- // context is sufficient for now. |
- return GetRequestContext(); |
-} |
- |
content::ResourceContext* TestingProfile::GetResourceContext() { |
if (!resource_context_) |
resource_context_ = new content::MockResourceContext(); |
@@ -948,6 +930,24 @@ TestingProfile::GetBackgroundSyncController() { |
return nullptr; |
} |
+net::URLRequestContextGetter* TestingProfile::CreateRequestContext( |
+ content::ProtocolHandlerMap* protocol_handlers, |
+ content::URLRequestInterceptorScopedVector request_interceptors) { |
+ return new net::TestURLRequestContextGetter( |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); |
+} |
+ |
+net::URLRequestContextGetter* |
+TestingProfile::CreateRequestContextForStoragePartition( |
+ const base::FilePath& partition_path, |
+ bool in_memory, |
+ content::ProtocolHandlerMap* protocol_handlers, |
+ content::URLRequestInterceptorScopedVector request_interceptors) { |
+ // We don't test storage partitions here yet, so returning the same dummy |
+ // context is sufficient for now. |
+ return GetRequestContext(); |
+} |
+ |
bool TestingProfile::WasCreatedByVersionOrLater(const std::string& version) { |
return true; |
} |