Remove the Extensions URLRequestContext

content/public/test/test_browser_context.cc

Index: content/public/test/test_browser_context.cc
diff --git a/content/public/test/test_browser_context.cc b/content/public/test/test_browser_context.cc
index 907f748323d33a3fa4d16b3cf09533d5081e7db5..4ab5f3cfd8e96d2be503724e04a89946210f130a 100644
--- a/content/public/test/test_browser_context.cc
+++ b/content/public/test/test_browser_context.cc
@@ -6,6 +6,8 @@
 
 #include "base/files/file_path.h"
 #include "base/test/null_task_runner.h"
+#include "content/public/browser/cookie_store_factory.h"
+#include "content/public/browser/storage_partition.h"
 #include "content/public/test/mock_resource_context.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
@@ -65,15 +67,16 @@ bool TestBrowserContext::IsOffTheRecord() const {
   return false;
 }
 
+CookieStoreConfig TestBrowserContext::GetCookieStoreConfig() {
+  return CookieStoreConfig::InMemory();
+}
+
 DownloadManagerDelegate* TestBrowserContext::GetDownloadManagerDelegate() {
   return NULL;
 }
 
 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() {
-  if (!request_context_.get()) {
-    request_context_ = new TestContextURLRequestContextGetter();
-  }
-  return request_context_.get();
+  return GetDefaultStoragePartition(this)->GetURLRequestContext();
 }
 
 net::URLRequestContextGetter*
@@ -109,8 +112,7 @@ void TestBrowserContext::RequestMIDISysExPermission(
 
 ResourceContext* TestBrowserContext::GetResourceContext() {
   if (!resource_context_)
-    resource_context_.reset(new MockResourceContext(
-        GetRequestContext()->GetURLRequestContext()));
+    resource_context_.reset(new MockResourceContext());
   return resource_context_.get();
 }