Generalize content::URLDataSource so that it can be used by the network service.

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 909d300d16ef1a92772a0add44dc447a2b999b2f..5c423a3b350ab5c744bba22ab9d3b4c979b17a40 100644
--- a/chrome/browser/search/iframe_source_unittest.cc
+++ b/chrome/browser/search/iframe_source_unittest.cc
@@ -89,22 +89,6 @@ class IframeSourceTest : public testing::Test {
     return "";
   }
 
-  std::unique_ptr<net::URLRequest> MockRequest(const std::string& url,
-                                               int render_process_id) {
-    std::unique_ptr<net::URLRequest> request(
-        resource_context_.GetRequestContext()->CreateRequest(
-            GURL(url), net::DEFAULT_PRIORITY, NULL,
-            TRAFFIC_ANNOTATION_FOR_TESTS));
-    content::ResourceRequestInfo::AllocateForTesting(
-        request.get(), content::RESOURCE_TYPE_SUB_FRAME, &resource_context_,
-        render_process_id, MSG_ROUTING_NONE, MSG_ROUTING_NONE,
-        /*is_main_frame=*/false,
-        /*parent_is_main_frame=*/false,
-        /*allow_download=*/true,
-        /*is_async=*/false, content::PREVIEWS_OFF);
-    return request;
-  }
-
   void SendResource(int resource_id) {
     source()->SendResource(resource_id, callback_);
   }
@@ -115,6 +99,11 @@ class IframeSourceTest : public testing::Test {
         callback_);
   }
 
+  bool ShouldService(const std::string& path, int process_id) {
+    return source()->ShouldServiceRequest(GURL(path), &resource_context_,
+                                          process_id);
+  }
+
  private:
   void SetUp() override {
     source_.reset(new TestIframeSource());
@@ -145,26 +134,23 @@ class IframeSourceTest : public testing::Test {
 };
 
 TEST_F(IframeSourceTest, ShouldServiceRequest) {
-  std::unique_ptr<net::URLRequest> request;
   source()->set_origin(kNonInstantOrigin);
-  request = MockRequest("http://test/loader.js", kNonInstantRendererPID);
-  EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_FALSE(ShouldService("http://test/loader.js", kNonInstantRendererPID));
   source()->set_origin(kInstantOrigin);
-  request = MockRequest("chrome-search://bogus/valid.js", kInstantRendererPID);
-  EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_FALSE(
+      ShouldService("chrome-search://bogus/valid.js", kInstantRendererPID));
   source()->set_origin(kInstantOrigin);
-  request = MockRequest("chrome-search://test/bogus.js", kInstantRendererPID);
-  EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_FALSE(
+      ShouldService("chrome-search://test/bogus.js", kInstantRendererPID));
   source()->set_origin(kInstantOrigin);
-  request = MockRequest("chrome-search://test/valid.js", kInstantRendererPID);
-  EXPECT_TRUE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_TRUE(
+      ShouldService("chrome-search://test/valid.js", kInstantRendererPID));
   source()->set_origin(kNonInstantOrigin);
-  request = MockRequest("chrome-search://test/valid.js",
-                        kNonInstantRendererPID);
-  EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_FALSE(
+      ShouldService("chrome-search://test/valid.js", kNonInstantRendererPID));
   source()->set_origin(std::string());
-  request = MockRequest("chrome-search://test/valid.js", kInvalidRendererPID);
-  EXPECT_FALSE(source()->ShouldServiceRequest(request.get()));
+  EXPECT_FALSE(
+      ShouldService("chrome-search://test/valid.js", kInvalidRendererPID));
 }
 
 TEST_F(IframeSourceTest, GetMimeType) {