Allow URLRequests from one context to have different NetworkDelegates.

chrome/browser/search/iframe_source_unittest.cc

Index: chrome/browser/search/iframe_source_unittest.cc
diff --git a/chrome/browser/search/iframe_source_unittest.cc b/chrome/browser/search/iframe_source_unittest.cc
index 8baf16fa3fe413c0a93a42c80f9a233c39226b31..801cb87a187d225f799dfb51b33d2456da63d4bd 100644
--- a/chrome/browser/search/iframe_source_unittest.cc
+++ b/chrome/browser/search/iframe_source_unittest.cc
@@ -93,19 +93,20 @@ class IframeSourceTest : public testing::Test {
     return "";
   }
 
-  net::URLRequest* MockRequest(
+  scoped_ptr<net::URLRequest> MockRequest(
       const std::string& url,
       bool allocate_info,
       int render_process_id,
       int render_frame_id) {
-    net::URLRequest* request =
-        new net::URLRequest(GURL(url),
-                            net::DEFAULT_PRIORITY,
-                            NULL,
-                            resource_context_.GetRequestContext());
+    scoped_ptr<net::URLRequest> request(
+        resource_context_.GetRequestContext()->CreateRequest(
+            GURL(url),
+            net::DEFAULT_PRIORITY,
+            NULL,
+            NULL));
     if (allocate_info) {
       content::ResourceRequestInfo::AllocateForTesting(
-          request,
+          request.get(),
           content::RESOURCE_TYPE_SUB_FRAME,
           &resource_context_,
           render_process_id,
@@ -113,7 +114,7 @@ class IframeSourceTest : public testing::Test {
           MSG_ROUTING_NONE,
           false);
     }
-    return request;
+    return request.Pass();
   }
 
   void SendResource(int resource_id) {
@@ -160,23 +161,23 @@ class IframeSourceTest : public testing::Test {
 
 TEST_F(IframeSourceTest, ShouldServiceRequest) {
   scoped_ptr<net::URLRequest> request;
-  request.reset(MockRequest("http://test/loader.js", true,
-                            kNonInstantRendererPID, 0));
+  request = MockRequest("http://test/loader.js", true,
+                        kNonInstantRendererPID, 0);
   EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
-  request.reset(MockRequest("chrome-search://bogus/valid.js", true,
-                            kInstantRendererPID, 0));
+  request = MockRequest("chrome-search://bogus/valid.js", true,
+                        kInstantRendererPID, 0);
   EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
-  request.reset(MockRequest("chrome-search://test/bogus.js", true,
-                            kInstantRendererPID, 0));
+  request = MockRequest("chrome-search://test/bogus.js", true,
+                        kInstantRendererPID, 0);
   EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
-  request.reset(MockRequest("chrome-search://test/valid.js", true,
-                            kInstantRendererPID, 0));
+  request = MockRequest("chrome-search://test/valid.js", true,
+                        kInstantRendererPID, 0);
   EXPECT_TRUE(source()->ShouldServiceRequest(request.get()));
-  request.reset(MockRequest("chrome-search://test/valid.js", true,
-                            kNonInstantRendererPID, 0));
+  request = MockRequest("chrome-search://test/valid.js", true,
+                        kNonInstantRendererPID, 0);
   EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
-  request.reset(MockRequest("chrome-search://test/valid.js", true,
-                            kInvalidRendererPID, 0));
+  request = MockRequest("chrome-search://test/valid.js", true,
+                        kInvalidRendererPID, 0);
   EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
 }