Allow URLRequests from one context to have different NetworkDelegates.

chrome/browser/prerender/prerender_tracker_unittest.cc

Index: chrome/browser/prerender/prerender_tracker_unittest.cc
diff --git a/chrome/browser/prerender/prerender_tracker_unittest.cc b/chrome/browser/prerender/prerender_tracker_unittest.cc
index eb19533f2c87f67b22edb7e61882de0854235c4c..6bc65e5f166f7f7cbc5d28e4dddcf431ce9e0547 100644
--- a/chrome/browser/prerender/prerender_tracker_unittest.cc
+++ b/chrome/browser/prerender/prerender_tracker_unittest.cc
@@ -223,12 +223,12 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
-  net::URLRequest request(
+  scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
-      &url_request_context);
-  content::ResourceRequestInfo::AllocateForTesting(&request,
+      NULL));
+  content::ResourceRequestInfo::AllocateForTesting(request.get(),
                                                    content::RESOURCE_TYPE_IMAGE,
                                                    NULL,
                                                    kDefaultChildId,
@@ -237,11 +237,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectResume) {
                                                    true);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request);
+  PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
-  request.Start();
+  request->Start();
   delegate.Run();
   EXPECT_TRUE(delegate.was_deferred());
   // This calls WillRedirectRequestOnUI().
@@ -266,13 +266,13 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
-  net::URLRequest request(
+  scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
-      &url_request_context);
+      NULL));
   content::ResourceRequestInfo::AllocateForTesting(
-      &request,
+      request.get(),
       content::RESOURCE_TYPE_MAIN_FRAME,
       NULL,
       kDefaultChildId,
@@ -281,12 +281,12 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectMainFrame) {
       true);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request);
+  PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect. This time, it should
   // not be deferred.
-  request.Start();
+  request->Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
   RunEvents();
@@ -308,12 +308,12 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {
   // Fake a request.
   net::TestURLRequestContext url_request_context;
   DeferredRedirectDelegate delegate;
-  net::URLRequest request(
+  scoped_ptr<net::URLRequest> request(url_request_context.CreateRequest(
       content::URLRequestMockHTTPJob::GetMockUrl(base::FilePath(kRedirectPath)),
       net::DEFAULT_PRIORITY,
       &delegate,
-      &url_request_context);
-  content::ResourceRequestInfo::AllocateForTesting(&request,
+      NULL));
+  content::ResourceRequestInfo::AllocateForTesting(request.get(),
                                                    content::RESOURCE_TYPE_XHR,
                                                    NULL,
                                                    kDefaultChildId,
@@ -322,11 +322,11 @@ TEST_F(PrerenderTrackerTest, PrerenderThrottledRedirectSyncXHR) {
                                                    false);
 
   // Install a prerender throttle.
-  PrerenderResourceThrottle throttle(&request);
+  PrerenderResourceThrottle throttle(request.get());
   delegate.SetThrottle(&throttle);
 
   // Start the request and wait for a redirect.
-  request.Start();
+  request->Start();
   delegate.Run();
   // This calls WillRedirectRequestOnUI().
   RunEvents();