Create LoadingDataCollector class and have observers rely on it instead of ResourcePrefetchPredictor

chrome/browser/predictors/resource_prefetch_predictor_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/predictors/resource_prefetch_predictor.h"
 
 #include <iostream>
 #include <memory>
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/predictors/loading_predictor.h"
+#include "chrome/browser/predictors/loading_test_util.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
-#include "chrome/browser/predictors/resource_prefetch_predictor_test_util.h"
 #include "chrome/browser/predictors/resource_prefetcher_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/sessions/core/session_id.h"
-#include "content/public/browser/resource_request_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/http/http_response_headers.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
-#include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::StrictMock;
 using testing::UnorderedElementsAre;
 
 namespace predictors {
 
 using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
 using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
 using PrefetchDataMap = std::map<std::string, PrefetchData>;
 using RedirectDataMap = std::map<std::string, RedirectData>;
 using OriginDataMap = std::map<std::string, OriginData>;
 using ManifestDataMap = std::map<std::string, precache::PrecacheManifest>;
 
-scoped_refptr<net::HttpResponseHeaders> MakeResponseHeaders(
-    const char* headers) {
-  return make_scoped_refptr(new net::HttpResponseHeaders(
-      net::HttpUtil::AssembleRawHeaders(headers, strlen(headers))));
-}
-
-class EmptyURLRequestDelegate : public net::URLRequest::Delegate {
-  void OnResponseStarted(net::URLRequest* request, int net_error) override {}
-  void OnReadCompleted(net::URLRequest* request, int bytes_read) override {}
-};
-
-class MockURLRequestJob : public net::URLRequestJob {
- public:
-  MockURLRequestJob(net::URLRequest* request,
-                    const net::HttpResponseInfo& response_info,
-                    const std::string& mime_type)
-      : net::URLRequestJob(request, nullptr),
-        response_info_(response_info),
-        mime_type_(mime_type) {}
-
-  bool GetMimeType(std::string* mime_type) const override {
-    *mime_type = mime_type_;
-    return true;
-  }
-
- protected:
-  void Start() override { NotifyHeadersComplete(); }
-  void GetResponseInfo(net::HttpResponseInfo* info) override {
-    *info = response_info_;
-  }
-
- private:
-  net::HttpResponseInfo response_info_;
-  std::string mime_type_;
-};
-
-class MockURLRequestJobFactory : public net::URLRequestJobFactory {
- public:
-  MockURLRequestJobFactory() {}
-  ~MockURLRequestJobFactory() override {}
-
-  net::URLRequestJob* MaybeCreateJobWithProtocolHandler(
-      const std::string& scheme,
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const override {
-    return new MockURLRequestJob(request, response_info_, mime_type_);
-  }
-
-  net::URLRequestJob* MaybeInterceptRedirect(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate,
-      const GURL& location) const override {
-    return nullptr;
-  }
-
-  net::URLRequestJob* MaybeInterceptResponse(
-      net::URLRequest* request,
-      net::NetworkDelegate* network_delegate) const override {
-    return nullptr;
-  }
-
-  bool IsHandledProtocol(const std::string& scheme) const override {
-    return true;
-  }
-
-  bool IsSafeRedirectTarget(const GURL& location) const override {
-    return true;
-  }
-
-  void set_response_info(const net::HttpResponseInfo& response_info) {
-    response_info_ = response_info;
-  }
-
-  void set_mime_type(const std::string& mime_type) { mime_type_ = mime_type; }
-
- private:
-  net::HttpResponseInfo response_info_;
-  std::string mime_type_;
-};
-
 template <typename T>
 class FakeGlowplugKeyValueTable : public GlowplugKeyValueTable<T> {
  public:
   FakeGlowplugKeyValueTable() : GlowplugKeyValueTable<T>("") {}
   void GetAllData(std::map<std::string, T>* data_map,
                   sql::Connection* db) const override {
     *data_map = data_;
   }
   void UpdateData(const std::string& key,
                   const T& data,
@@ skipping 52 matching lines @@
   FakeGlowplugKeyValueTable<RedirectData> url_redirect_table_;
   FakeGlowplugKeyValueTable<PrefetchData> host_resource_table_;
   FakeGlowplugKeyValueTable<RedirectData> host_redirect_table_;
   FakeGlowplugKeyValueTable<precache::PrecacheManifest> manifest_table_;
   FakeGlowplugKeyValueTable<OriginData> origin_table_;
 
  protected:
   ~MockResourcePrefetchPredictorTables() override = default;
 };
 
-class MockResourcePrefetchPredictorObserver : public TestObserver {
+class MockLoadingPredictorObserver : public TestObserver {

[alexilin, 2017/06/07 12:37:31]

nit:
It seems that this renaming wasn't really intended. This observer still observes
ResourcePrefetchPredictor. We'll refactor it soon anyway so you can leave it as
is.

[trevordixon, 2017/06/07 13:17:55]

Oops! As easy as it is, I might as well rename it back.

  public:
-  explicit MockResourcePrefetchPredictorObserver(
-      ResourcePrefetchPredictor* predictor)
+  explicit MockLoadingPredictorObserver(ResourcePrefetchPredictor* predictor)
       : TestObserver(predictor) {}
 
   MOCK_METHOD2(
       OnNavigationLearned,
       void(size_t url_visit_count,
            const ResourcePrefetchPredictor::PageRequestSummary& summary));
 };
 
 class ResourcePrefetchPredictorTest : public testing::Test {
  public:
@@ skipping 20 matching lines @@
   URLRequestSummary CreateRedirectRequestSummary(
       SessionID::id_type session_id,
       const std::string& main_frame_url,
       const std::string& redirect_url) {
     URLRequestSummary summary =
         CreateURLRequestSummary(session_id, main_frame_url);
     summary.redirect_url = GURL(redirect_url);
     return summary;
   }
 
-  std::unique_ptr<net::URLRequest> CreateURLRequest(
-      const GURL& url,
-      net::RequestPriority priority,
-      content::ResourceType resource_type,
-      bool is_main_frame) {
-    std::unique_ptr<net::URLRequest> request =
-        url_request_context_.CreateRequest(url, priority,
-                                           &url_request_delegate_,
-                                           TRAFFIC_ANNOTATION_FOR_TESTS);
-    request->set_first_party_for_cookies(url);
-    content::ResourceRequestInfo::AllocateForTesting(
-        request.get(), resource_type, nullptr, -1, -1, -1, is_main_frame, false,
-        false, true, content::PREVIEWS_OFF);
-    request->Start();
-    return request;
-  }
-
   void InitializePredictor() {
     loading_predictor_->StartInitialization();
     base::RunLoop loop;
     loop.RunUntilIdle();  // Runs the DB lookup.
     profile_->BlockUntilHistoryProcessesPendingRequests();
   }
 
   void ResetPredictor(bool small_db = true) {
     LoadingPredictorConfig config;
     PopulateTestConfig(&config, small_db);
@@ skipping 44 matching lines @@
       profile_.get(), ServiceAccessType::EXPLICIT_ACCESS));
   // Initialize the predictor with empty data.
   ResetPredictor();
   EXPECT_EQ(predictor_->initialization_state_,
             ResourcePrefetchPredictor::NOT_INITIALIZED);
   InitializePredictor();
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
   EXPECT_EQ(predictor_->initialization_state_,
             ResourcePrefetchPredictor::INITIALIZED);
 
+  url_request_job_factory_.Reset();
   url_request_context_.set_job_factory(&url_request_job_factory_);
 
   histogram_tester_.reset(new base::HistogramTester());
 }
 
 void ResourcePrefetchPredictorTest::TearDown() {
   EXPECT_EQ(*predictor_->url_resource_data_->data_cache_,
             mock_tables_->url_resource_table_.data_);
   EXPECT_EQ(*predictor_->url_redirect_data_->data_cache_,
             mock_tables_->url_redirect_table_.data_);
@@ skipping 220 matching lines @@
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, "https://www.google.com", "https://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource2);
   URLRequestSummary resource3 = CreateURLRequestSummary(
       1, "https://www.google.com", "https://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount,
                           CreatePageRequestSummary(
                               "https://www.google.com", "http://www.google.com",
                               {resource1, resource2, resource3})));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
@@ skipping 78 matching lines @@
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   redirected.redirect_url = GURL("http://dev.null.google.com/style.css");
 
   predictor_->RecordURLRedirect(redirected);
   redirected.is_no_store = true;
   redirected.request_url = redirected.redirect_url;
   redirected.redirect_url = GURL();
 
   predictor_->RecordURLResponse(redirected);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   PrefetchData url_data = CreatePrefetchData("http://www.google.com/");
@@ skipping 93 matching lines @@
       1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true));
   predictor_->RecordURLResponse(resources.back());
   auto no_store = CreateURLRequestSummary(
       1, "http://www.google.com",
       "http://static.google.com/style2-no-store.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   no_store.is_no_store = true;
   predictor_->RecordURLResponse(no_store);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   PrefetchData url_data = CreatePrefetchData("http://www.google.com/");
@@ skipping 81 matching lines @@
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, "http://www.nike.com", "http://nike.com/style1.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, "http://www.nike.com", "http://nike.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource2);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary(
                                    "http://www.nike.com", "http://www.nike.com",
                                    {resource1, resource2})));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
   PrefetchData url_data = CreatePrefetchData("http://www.nike.com/");
@@ skipping 49 matching lines @@
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
       1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
       1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
   NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
   predictor_->RecordMainFrameLoadComplete(fb_end);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
@@ skipping 29 matching lines @@
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
       1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
       1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
   NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
+  StrictMock<MockLoadingPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
   predictor_->RecordMainFrameLoadComplete(fb_end);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 
@@ skipping 396 matching lines @@
             predictor_->inflight_navigations_[main_frame1.navigation_id]
                 ->subresource_requests[0]);
   EXPECT_EQ(resource2,
             predictor_->inflight_navigations_[main_frame1.navigation_id]
                 ->subresource_requests[1]);
   EXPECT_EQ(resource3,
             predictor_->inflight_navigations_[main_frame1.navigation_id]
                 ->subresource_requests[2]);
 }
 
-TEST_F(ResourcePrefetchPredictorTest, HandledResourceTypes) {
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_STYLESHEET, "bogus/mime-type"));
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_STYLESHEET, ""));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_WORKER, "text/css"));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_WORKER, ""));
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_PREFETCH, "text/css"));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_PREFETCH, "bogus/mime-type"));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_PREFETCH, ""));
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_PREFETCH, "application/font-woff"));
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_PREFETCH, "font/woff2"));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_XHR, ""));
-  EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_XHR, "bogus/mime-type"));
-  EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
-      content::RESOURCE_TYPE_XHR, "application/javascript"));
-}
-
-TEST_F(ResourcePrefetchPredictorTest, ShouldRecordRequestMainFrame) {
-  std::unique_ptr<net::URLRequest> http_request =
-      CreateURLRequest(GURL("http://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      http_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
-
-  std::unique_ptr<net::URLRequest> https_request =
-      CreateURLRequest(GURL("https://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      https_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
-
-  std::unique_ptr<net::URLRequest> file_request =
-      CreateURLRequest(GURL("file://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      file_request.get(), content::RESOURCE_TYPE_MAIN_FRAME));
-
-  std::unique_ptr<net::URLRequest> https_request_with_port =
-      CreateURLRequest(GURL("https://www.google.com:666"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      https_request_with_port.get(), content::RESOURCE_TYPE_MAIN_FRAME));
-}
-
-TEST_F(ResourcePrefetchPredictorTest, ShouldRecordRequestSubResource) {
-  std::unique_ptr<net::URLRequest> http_request =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, false);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      http_request.get(), content::RESOURCE_TYPE_IMAGE));
-
-  std::unique_ptr<net::URLRequest> https_request =
-      CreateURLRequest(GURL("https://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, false);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      https_request.get(), content::RESOURCE_TYPE_IMAGE));
-
-  std::unique_ptr<net::URLRequest> file_request =
-      CreateURLRequest(GURL("file://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, false);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      file_request.get(), content::RESOURCE_TYPE_IMAGE));
-
-  std::unique_ptr<net::URLRequest> https_request_with_port =
-      CreateURLRequest(GURL("https://www.google.com:666/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, false);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordRequest(
-      https_request_with_port.get(), content::RESOURCE_TYPE_IMAGE));
-}
-
-TEST_F(ResourcePrefetchPredictorTest, ShouldRecordResponseMainFrame) {
-  net::HttpResponseInfo response_info;
-  response_info.headers = MakeResponseHeaders("");
-  url_request_job_factory_.set_response_info(response_info);
-
-  std::unique_ptr<net::URLRequest> http_request =
-      CreateURLRequest(GURL("http://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, true);
-  EXPECT_TRUE(
-      ResourcePrefetchPredictor::ShouldRecordResponse(http_request.get()));
-
-  std::unique_ptr<net::URLRequest> https_request =
-      CreateURLRequest(GURL("https://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, true);
-  EXPECT_TRUE(
-      ResourcePrefetchPredictor::ShouldRecordResponse(https_request.get()));
-
-  std::unique_ptr<net::URLRequest> file_request =
-      CreateURLRequest(GURL("file://www.google.com"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, true);
-  EXPECT_FALSE(
-      ResourcePrefetchPredictor::ShouldRecordResponse(file_request.get()));
-
-  std::unique_ptr<net::URLRequest> https_request_with_port =
-      CreateURLRequest(GURL("https://www.google.com:666"), net::MEDIUM,
-                       content::RESOURCE_TYPE_MAIN_FRAME, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      https_request_with_port.get()));
-}
-
-TEST_F(ResourcePrefetchPredictorTest, ShouldRecordResponseSubresource) {
-  net::HttpResponseInfo response_info;
-  response_info.headers =
-      MakeResponseHeaders("HTTP/1.1 200 OK\n\nSome: Headers\n");
-  response_info.was_cached = true;
-  url_request_job_factory_.set_response_info(response_info);
-
-  // Protocol.
-  std::unique_ptr<net::URLRequest> http_image_request =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      http_image_request.get()));
-
-  std::unique_ptr<net::URLRequest> https_image_request =
-      CreateURLRequest(GURL("https://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      https_image_request.get()));
-
-  std::unique_ptr<net::URLRequest> https_image_request_with_port =
-      CreateURLRequest(GURL("https://www.google.com:666/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      https_image_request_with_port.get()));
-
-  std::unique_ptr<net::URLRequest> file_image_request =
-      CreateURLRequest(GURL("file://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_IMAGE, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      file_image_request.get()));
-
-  // ResourceType.
-  std::unique_ptr<net::URLRequest> sub_frame_request =
-      CreateURLRequest(GURL("http://www.google.com/frame.html"), net::MEDIUM,
-                       content::RESOURCE_TYPE_SUB_FRAME, true);
-  EXPECT_FALSE(
-      ResourcePrefetchPredictor::ShouldRecordResponse(sub_frame_request.get()));
-
-  std::unique_ptr<net::URLRequest> font_request =
-      CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
-                       net::MEDIUM, content::RESOURCE_TYPE_FONT_RESOURCE, true);
-  EXPECT_TRUE(
-      ResourcePrefetchPredictor::ShouldRecordResponse(font_request.get()));
-
-  // From MIME Type.
-  url_request_job_factory_.set_mime_type("image/png");
-  std::unique_ptr<net::URLRequest> prefetch_image_request =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      prefetch_image_request.get()));
-
-  url_request_job_factory_.set_mime_type("image/my-wonderful-format");
-  std::unique_ptr<net::URLRequest> prefetch_unknown_image_request =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      prefetch_unknown_image_request.get()));
-
-  url_request_job_factory_.set_mime_type("font/woff");
-  std::unique_ptr<net::URLRequest> prefetch_font_request =
-      CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
-                       net::MEDIUM, content::RESOURCE_TYPE_PREFETCH, true);
-  EXPECT_TRUE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      prefetch_font_request.get()));
-
-  url_request_job_factory_.set_mime_type("font/woff-woff");
-  std::unique_ptr<net::URLRequest> prefetch_unknown_font_request =
-      CreateURLRequest(GURL("http://www.google.com/comic-sans-ms.woff"),
-                       net::MEDIUM, content::RESOURCE_TYPE_PREFETCH, true);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      prefetch_unknown_font_request.get()));
-
-  // Not main frame.
-  std::unique_ptr<net::URLRequest> font_request_sub_frame = CreateURLRequest(
-      GURL("http://www.google.com/comic-sans-ms.woff"), net::MEDIUM,
-      content::RESOURCE_TYPE_FONT_RESOURCE, false);
-  EXPECT_FALSE(ResourcePrefetchPredictor::ShouldRecordResponse(
-      font_request_sub_frame.get()));
-}
-
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponse) {
   net::HttpResponseInfo response_info;
   response_info.headers =
       MakeResponseHeaders("HTTP/1.1 200 OK\n\nSome: Headers\n");
   response_info.was_cached = true;
   url_request_job_factory_.set_response_info(response_info);
 
   GURL url("http://www.google.com/cat.png");
   std::unique_ptr<net::URLRequest> request =
-      CreateURLRequest(url, net::MEDIUM, content::RESOURCE_TYPE_IMAGE, true);
+      CreateURLRequest(url_request_context_, url, net::MEDIUM,
+                       content::RESOURCE_TYPE_IMAGE, true);
   URLRequestSummary summary;
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request, &summary));
   EXPECT_EQ(url, summary.resource_url);
   EXPECT_EQ(content::RESOURCE_TYPE_IMAGE, summary.resource_type);
   EXPECT_TRUE(summary.was_cached);
   EXPECT_FALSE(summary.has_validators);
   EXPECT_FALSE(summary.always_revalidate);
 
   // Navigation_id elements should be unset by default.
   EXPECT_EQ(-1, summary.navigation_id.tab_id);
   EXPECT_EQ(GURL(), summary.navigation_id.main_frame_url);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponseContentType) {
   net::HttpResponseInfo response_info;
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n\n"
       "Some: Headers\n"
       "Content-Type: image/whatever\n");
   url_request_job_factory_.set_response_info(response_info);
   url_request_job_factory_.set_mime_type("image/png");
 
-  std::unique_ptr<net::URLRequest> request =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, true);
+  std::unique_ptr<net::URLRequest> request = CreateURLRequest(
+      url_request_context_, GURL("http://www.google.com/cat.png"), net::MEDIUM,
+      content::RESOURCE_TYPE_PREFETCH, true);
   URLRequestSummary summary;
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request, &summary));
   EXPECT_EQ(content::RESOURCE_TYPE_IMAGE, summary.resource_type);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponseCachePolicy) {
   net::HttpResponseInfo response_info;
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n"
       "Some: Headers\n");
   url_request_job_factory_.set_response_info(response_info);
 
-  std::unique_ptr<net::URLRequest> request_no_validators =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, true);
+  std::unique_ptr<net::URLRequest> request_no_validators = CreateURLRequest(
+      url_request_context_, GURL("http://www.google.com/cat.png"), net::MEDIUM,
+      content::RESOURCE_TYPE_PREFETCH, true);
 
   URLRequestSummary summary;
   EXPECT_TRUE(
       URLRequestSummary::SummarizeResponse(*request_no_validators, &summary));
   EXPECT_FALSE(summary.has_validators);
 
   response_info.headers = MakeResponseHeaders(
       "HTTP/1.1 200 OK\n"
       "ETag: \"Cr66\"\n"
       "Cache-Control: no-cache\n");
   url_request_job_factory_.set_response_info(response_info);
-  std::unique_ptr<net::URLRequest> request_etag =
-      CreateURLRequest(GURL("http://www.google.com/cat.png"), net::MEDIUM,
-                       content::RESOURCE_TYPE_PREFETCH, true);
+  std::unique_ptr<net::URLRequest> request_etag = CreateURLRequest(
+      url_request_context_, GURL("http://www.google.com/cat.png"), net::MEDIUM,
+      content::RESOURCE_TYPE_PREFETCH, true);
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request_etag, &summary));
   EXPECT_TRUE(summary.has_validators);
   EXPECT_TRUE(summary.always_revalidate);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, PopulatePrefetcherRequest) {
   // The data that will be used in populating.
   PrefetchData google = CreatePrefetchData("http://www.google.com/", 1);
   InitializeResourceData(google.add_resources(), "http://google.com/image1.png",
                          content::RESOURCE_TYPE_IMAGE, 10, 0, 0, 2.2,
@@ skipping 281 matching lines @@
   ResourceData* resource3_rd = host_data.add_resources();
   InitializeResourceData(resource3_rd, "http://google.com/script2.js",
                          content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0,
                          net::MEDIUM, false, false);
   resource3_rd->set_before_first_contentful_paint(false);
   EXPECT_EQ(mock_tables_->host_resource_table_.data_,
             PrefetchDataMap({{host_data.primary_key(), host_data}}));
 }
 
 }  // namespace predictors