Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/content/browser/loader/resource_dispatcher_host_unittest.cc

Index: trunk/src/content/browser/loader/resource_dispatcher_host_unittest.cc
===================================================================
--- trunk/src/content/browser/loader/resource_dispatcher_host_unittest.cc	(revision 219785)
+++ trunk/src/content/browser/loader/resource_dispatcher_host_unittest.cc	(working copy)
@@ -33,7 +33,6 @@
 #include "net/http/http_util.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_context.h"
-#include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_simple_job.h"
 #include "net/url_request/url_request_test_job.h"
@@ -183,14 +182,13 @@
 class ForwardingFilter : public ResourceMessageFilter {
  public:
   explicit ForwardingFilter(IPC::Sender* dest,
-                            ResourceContext* resource_context,
-                            net::URLRequestContextGetter* request_context)
+                            ResourceContext* resource_context)
     : ResourceMessageFilter(
         ChildProcessHostImpl::GenerateChildProcessUniqueId(),
         PROCESS_TYPE_RENDERER,
         resource_context, NULL, NULL, NULL,
         new MockURLRequestContextSelector(
-            request_context->GetURLRequestContext())),
+            resource_context->GetRequestContext())),
       dest_(dest) {
     OnChannelConnected(base::GetCurrentProcId());
   }
@@ -535,8 +533,7 @@
     BrowserContext::EnsureResourceContextInitialized(browser_context_.get());
     message_loop_.RunUntilIdle();
     filter_ = new ForwardingFilter(
-        this, browser_context_->GetResourceContext(),
-        browser_context_->GetRequestContext());
+        this, browser_context_->GetResourceContext());
   }
 
   virtual ~ResourceDispatcherHostTest() {
@@ -1053,9 +1050,8 @@
 // pending and some canceled.
 class TestFilter : public ForwardingFilter {
  public:
-  explicit TestFilter(ResourceContext* resource_context,
-                      net::URLRequestContextGetter* url_request_context)
-      : ForwardingFilter(NULL, resource_context, url_request_context),
+  explicit TestFilter(ResourceContext* resource_context)
+      : ForwardingFilter(NULL, resource_context),
         has_canceled_(false),
         received_after_canceled_(0) {
   }
@@ -1079,8 +1075,7 @@
 // Tests CancelRequestsForProcess
 TEST_F(ResourceDispatcherHostTest, TestProcessCancel) {
   scoped_refptr<TestFilter> test_filter = new TestFilter(
-      browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      browser_context_->GetResourceContext());
 
   // request 1 goes to the test delegate
   ResourceHostMsg_Request request = CreateResourceRequest(
@@ -1223,8 +1218,7 @@
 TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsProcessDies) {
   // This second filter is used to emulate a second process.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   host_.BlockRequestsForRoute(second_filter->child_id(), 0);
 
@@ -1261,8 +1255,7 @@
 TEST_F(ResourceDispatcherHostTest, TestBlockedRequestsDontLeak) {
   // This second filter is used to emulate a second process.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   host_.BlockRequestsForRoute(filter_->child_id(), 1);
   host_.BlockRequestsForRoute(filter_->child_id(), 2);
@@ -1329,8 +1322,7 @@
 
   // This second filter is used to emulate a second process.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   // Saturate the number of outstanding requests for our process.
   for (size_t i = 0; i < kMaxRequests; ++i) {
@@ -1394,11 +1386,9 @@
 
   // Needed to emulate additional processes.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
   scoped_refptr<ForwardingFilter> third_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   // Saturate the number of outstanding requests for our process.
   for (size_t i = 0; i < kMaxRequestsPerProcess; ++i) {
@@ -1738,8 +1728,7 @@
 
   // This second filter is used to emulate a second process.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   int new_render_view_id = 1;
   int new_request_id = 2;
@@ -1800,8 +1789,7 @@
 
   // This second filter is used to emulate a second process.
   scoped_refptr<ForwardingFilter> second_filter = new ForwardingFilter(
-      this, browser_context_->GetResourceContext(),
-      browser_context_->GetRequestContext());
+      this, browser_context_->GetResourceContext());
 
   int new_render_view_id = 1;
   int new_request_id = 2;