Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/content/public/test/test_browser_context.cc

Index: trunk/src/content/public/test/test_browser_context.cc
===================================================================
--- trunk/src/content/public/test/test_browser_context.cc	(revision 219785)
+++ trunk/src/content/public/test/test_browser_context.cc	(working copy)
@@ -6,8 +6,6 @@
 
 #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"
@@ -72,7 +70,10 @@
 }
 
 net::URLRequestContextGetter* TestBrowserContext::GetRequestContext() {
-  return GetDefaultStoragePartition(this)->GetURLRequestContext();
+  if (!request_context_.get()) {
+    request_context_ = new TestContextURLRequestContextGetter();
+  }
+  return request_context_.get();
 }
 
 net::URLRequestContextGetter*
@@ -108,7 +109,8 @@
 
 ResourceContext* TestBrowserContext::GetResourceContext() {
   if (!resource_context_)
-    resource_context_.reset(new MockResourceContext());
+    resource_context_.reset(new MockResourceContext(
+        GetRequestContext()->GetURLRequestContext()));
   return resource_context_.get();
 }