Refactor the resource_prefetch_predictor.

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 "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
+#include "chrome/browser/predictors/resource_prefetch_predictor_test_util.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 "content/public/browser/resource_request_info.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/http/http_response_headers.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 "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using testing::ContainerEq;
 using testing::Pointee;
 using testing::SetArgPointee;
 using testing::StrictMock;
 
 namespace predictors {
 
 typedef ResourcePrefetchPredictor::URLRequestSummary URLRequestSummary;
-typedef ResourcePrefetchPredictorTables::ResourceRow ResourceRow;
-typedef std::vector<ResourceRow> ResourceRows;
 typedef ResourcePrefetchPredictorTables::PrefetchData PrefetchData;
 typedef ResourcePrefetchPredictorTables::PrefetchDataMap PrefetchDataMap;
 
-// For printing failures nicely.
-void PrintTo(const ResourceRow& row, ::std::ostream* os) {
-  *os << "["
-      << "," << row.resource_url << "," << row.resource_type << ","
-      << row.number_of_hits << "," << row.number_of_misses << ","
-      << row.consecutive_misses << "," << row.average_position << ","
-      << row.score << "]";
-}
-
-void PrintTo(const PrefetchData& data, ::std::ostream* os) {
-  *os << "[" << data.key_type << "," << data.primary_key
-      << "," << data.last_visit.ToInternalValue() << "]\n";
-  for (ResourceRows::const_iterator it = data.resources.begin();
-       it != data.resources.end(); ++it) {
-    *os << "\t\t";
-    PrintTo(*it, os);
-    *os << "\n";
-  }
-}
-
 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) override {}
   void OnReadCompleted(net::URLRequest* request, int bytes_read) override {}
 };
@@ skipping 247 matching lines @@
 
 void ResourcePrefetchPredictorTest::TearDown() {
   predictor_.reset(NULL);
   profile_->DestroyHistoryService();
 }
 
 void ResourcePrefetchPredictorTest::InitializeSampleData() {
   {  // Url data.
     PrefetchData google(PREFETCH_KEY_TYPE_URL, "http://www.google.com/");
     google.last_visit = base::Time::FromInternalValue(1);
-    google.resources.push_back(ResourceRow(
+    google.resources.push_back(CreateResourceData(
         "http://google.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 3, 2,
         1, 1.0, net::MEDIUM, false, false));
-    google.resources.push_back(ResourceRow("http://google.com/script3.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 4, 0,
-                                           1, 2.1, net::MEDIUM, false, false));
-    google.resources.push_back(ResourceRow("http://google.com/script4.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 11, 0,
-                                           0, 2.1, net::MEDIUM, false, false));
-    google.resources.push_back(ResourceRow("http://google.com/image1.png",
-                                           content::RESOURCE_TYPE_IMAGE, 6, 3,
-                                           0, 2.2, net::MEDIUM, false, false));
-    google.resources.push_back(ResourceRow(
+    google.resources.push_back(CreateResourceData(
+        "http://google.com/script3.js", content::RESOURCE_TYPE_SCRIPT, 4, 0, 1,
+        2.1, net::MEDIUM, false, false));
+    google.resources.push_back(CreateResourceData(
+        "http://google.com/script4.js", content::RESOURCE_TYPE_SCRIPT, 11, 0, 0,
+        2.1, net::MEDIUM, false, false));
+    google.resources.push_back(CreateResourceData(
+        "http://google.com/image1.png", content::RESOURCE_TYPE_IMAGE, 6, 3, 0,
+        2.2, net::MEDIUM, false, false));
+    google.resources.push_back(CreateResourceData(
         "http://google.com/a.font", content::RESOURCE_TYPE_LAST_TYPE, 2, 0, 0,
         5.1, net::MEDIUM, false, false));
 
     PrefetchData reddit(PREFETCH_KEY_TYPE_URL, "http://www.reddit.com/");
     reddit.last_visit = base::Time::FromInternalValue(2);
-    reddit.resources.push_back(ResourceRow(
+    reddit.resources.push_back(CreateResourceData(
         "http://reddit-resource.com/script1.js", content::RESOURCE_TYPE_SCRIPT,
         4, 0, 1, 1.0, net::MEDIUM, false, false));
-    reddit.resources.push_back(ResourceRow(
+    reddit.resources.push_back(CreateResourceData(
         "http://reddit-resource.com/script2.js", content::RESOURCE_TYPE_SCRIPT,
         2, 0, 0, 2.1, net::MEDIUM, false, false));
 
     PrefetchData yahoo(PREFETCH_KEY_TYPE_URL, "http://www.yahoo.com/");
     yahoo.last_visit = base::Time::FromInternalValue(3);
-    yahoo.resources.push_back(ResourceRow("http://google.com/image.png",
-                                          content::RESOURCE_TYPE_IMAGE, 20, 1,
-                                          0, 10.0, net::MEDIUM, false, false));
+    yahoo.resources.push_back(CreateResourceData(
+        "http://google.com/image.png", content::RESOURCE_TYPE_IMAGE, 20, 1, 0,
+        10.0, net::MEDIUM, false, false));
 
     test_url_data_.clear();
     test_url_data_.insert(std::make_pair("http://www.google.com/", google));
     test_url_data_.insert(std::make_pair("http://www.reddit.com/", reddit));
     test_url_data_.insert(std::make_pair("http://www.yahoo.com/", yahoo));
   }
 
   {  // Host data.
     PrefetchData facebook(PREFETCH_KEY_TYPE_HOST, "www.facebook.com");
     facebook.last_visit = base::Time::FromInternalValue(4);
-    facebook.resources.push_back(ResourceRow(
+    facebook.resources.push_back(CreateResourceData(
         "http://www.facebook.com/style.css", content::RESOURCE_TYPE_STYLESHEET,
         5, 2, 1, 1.1, net::MEDIUM, false, false));
-    facebook.resources.push_back(ResourceRow(
+    facebook.resources.push_back(CreateResourceData(
         "http://www.facebook.com/script.js", content::RESOURCE_TYPE_SCRIPT, 4,
         0, 1, 2.1, net::MEDIUM, false, false));
-    facebook.resources.push_back(ResourceRow(
+    facebook.resources.push_back(CreateResourceData(
         "http://www.facebook.com/image.png", content::RESOURCE_TYPE_IMAGE, 6, 3,
         0, 2.2, net::MEDIUM, false, false));
-    facebook.resources.push_back(ResourceRow(
+    facebook.resources.push_back(CreateResourceData(
         "http://www.facebook.com/a.font", content::RESOURCE_TYPE_LAST_TYPE, 2,
         0, 0, 5.1, net::MEDIUM, false, false));
     facebook.resources.push_back(
-        ResourceRow("http://www.resources.facebook.com/script.js",
-                    content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 8.5, net::MEDIUM,
-                    false, false));
+        CreateResourceData("http://www.resources.facebook.com/script.js",
+                           content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 8.5,
+                           net::MEDIUM, false, false));
 
     PrefetchData yahoo(PREFETCH_KEY_TYPE_HOST, "www.yahoo.com");
     yahoo.last_visit = base::Time::FromInternalValue(5);
-    yahoo.resources.push_back(ResourceRow("http://google.com/image.png",
-                                          content::RESOURCE_TYPE_IMAGE, 20, 1,
-                                          0, 10.0, net::MEDIUM, false, false));
+    yahoo.resources.push_back(CreateResourceData(
+        "http://google.com/image.png", content::RESOURCE_TYPE_IMAGE, 20, 1, 0,
+        10.0, net::MEDIUM, false, false));
 
     test_host_data_.clear();
     test_host_data_.insert(std::make_pair("www.facebook.com", facebook));
     test_host_data_.insert(std::make_pair("www.yahoo.com", yahoo));
   }
 }
 
 TEST_F(ResourcePrefetchPredictorTest, LazilyInitializeEmpty) {
   // Tests that the predictor initializes correctly without any data.
   EXPECT_TRUE(predictor_->url_table_cache_->empty());
@@ skipping 41 matching lines @@
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource2);
   URLRequestSummary resource3 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
-  host_data.resources.push_back(ResourceRow(
+  host_data.resources.push_back(CreateResourceData(
       "http://google.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0,
       0, 1.0, net::MEDIUM, false, false));
-  host_data.resources.push_back(ResourceRow("http://google.com/script1.js",
-                                            content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                            0, 2.0, net::MEDIUM, false, false));
-  host_data.resources.push_back(ResourceRow("http://google.com/script2.js",
-                                            content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                            0, 3.0, net::MEDIUM, false, false));
+  host_data.resources.push_back(CreateResourceData(
+      "http://google.com/script1.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      2.0, net::MEDIUM, false, false));
+  host_data.resources.push_back(CreateResourceData(
+      "http://google.com/script2.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      3.0, net::MEDIUM, false, false));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlNotInDB) {
   // Single navigation that will be recorded. Will check for duplicate
   // resources and also for number of resources saved.
   AddUrlToHistory("http://www.google.com", 4);
@@ skipping 27 matching lines @@
   URLRequestSummary resource6 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource6);
   URLRequestSummary resource7 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   predictor_->RecordURLResponse(resource7);
 
   PrefetchData url_data(PREFETCH_KEY_TYPE_URL, "http://www.google.com/");
-  url_data.resources.push_back(ResourceRow(
+  url_data.resources.push_back(CreateResourceData(
       "http://google.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0,
       0, 1.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://google.com/script1.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                           0, 2.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://google.com/script2.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                           0, 3.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow(
+  url_data.resources.push_back(CreateResourceData(
+      "http://google.com/script1.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      2.0, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
+      "http://google.com/script2.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      3.0, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
       "http://google.com/style2.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0,
       0, 7.0, net::MEDIUM, false, false));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(url_data, empty_host_data_));
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
   host_data.resources = url_data.resources;
   EXPECT_CALL(*mock_tables_.get(), UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
@@ skipping 43 matching lines @@
   URLRequestSummary resource6 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource6);
   URLRequestSummary resource7 = CreateURLRequestSummary(
       1, 1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   predictor_->RecordURLResponse(resource7);
 
   PrefetchData url_data(PREFETCH_KEY_TYPE_URL, "http://www.google.com/");
-  url_data.resources.push_back(ResourceRow(
+  url_data.resources.push_back(CreateResourceData(
       "http://google.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 4, 2,
       0, 1.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://google.com/script1.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                           0, 2.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://google.com/script4.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 11, 1,
-                                           1, 2.1, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://google.com/script2.js",
-                                           content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                           0, 3.0, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
+      "http://google.com/script1.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      2.0, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
+      "http://google.com/script4.js", content::RESOURCE_TYPE_SCRIPT, 11, 1, 1,
+      2.1, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
+      "http://google.com/script2.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      3.0, net::MEDIUM, false, false));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(url_data, empty_host_data_));
 
   EXPECT_CALL(
       *mock_tables_.get(),
       DeleteSingleDataPoint("www.facebook.com", PREFETCH_KEY_TYPE_HOST));
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
-  host_data.resources.push_back(ResourceRow(
+  host_data.resources.push_back(CreateResourceData(
       "http://google.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0,
       0, 1.0, net::MEDIUM, false, false));
-  host_data.resources.push_back(ResourceRow("http://google.com/script1.js",
-                                            content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                            0, 2.0, net::MEDIUM, false, false));
-  host_data.resources.push_back(ResourceRow("http://google.com/script2.js",
-                                            content::RESOURCE_TYPE_SCRIPT, 1, 0,
-                                            0, 3.0, net::MEDIUM, false, false));
-  host_data.resources.push_back(ResourceRow(
+  host_data.resources.push_back(CreateResourceData(
+      "http://google.com/script1.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      2.0, net::MEDIUM, false, false));
+  host_data.resources.push_back(CreateResourceData(
+      "http://google.com/script2.js", content::RESOURCE_TYPE_SCRIPT, 1, 0, 0,
+      3.0, net::MEDIUM, false, false));
+  host_data.resources.push_back(CreateResourceData(
       "http://google.com/style2.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0,
       0, 7.0, net::MEDIUM, false, false));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlNotInDBAndDBFull) {
   // Tests that a URL is deleted before another is added if the cache is full.
@@ skipping 25 matching lines @@
   predictor_->RecordURLResponse(resource2);
 
   EXPECT_CALL(
       *mock_tables_.get(),
       DeleteSingleDataPoint("http://www.google.com/", PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(
       *mock_tables_.get(),
       DeleteSingleDataPoint("www.facebook.com", PREFETCH_KEY_TYPE_HOST));
 
   PrefetchData url_data(PREFETCH_KEY_TYPE_URL, "http://www.nike.com/");
-  url_data.resources.push_back(ResourceRow(
+  url_data.resources.push_back(CreateResourceData(
       "http://nike.com/style1.css", content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0,
       1.0, net::MEDIUM, false, false));
-  url_data.resources.push_back(ResourceRow("http://nike.com/image2.png",
-                                           content::RESOURCE_TYPE_IMAGE, 1, 0,
-                                           0, 2.0, net::MEDIUM, false, false));
+  url_data.resources.push_back(CreateResourceData(
+      "http://nike.com/image2.png", content::RESOURCE_TYPE_IMAGE, 1, 0, 0, 2.0,
+      net::MEDIUM, false, false));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(url_data, empty_host_data_));
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.nike.com");
   host_data.resources = url_data.resources;
   EXPECT_CALL(*mock_tables_.get(), UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
@@ skipping 392 matching lines @@
   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, 1, 1, true);
   EXPECT_TRUE(URLRequestSummary::SummarizeResponse(*request_etag, &summary));
   EXPECT_TRUE(summary.has_validators);
   EXPECT_TRUE(summary.always_revalidate);
 }
 
 }  // namespace predictors