predictors: Refactor UpdateData() function.

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>
 
@@ skipping 119 matching lines @@
  public:
   MockResourcePrefetchPredictorTables() { }
 
   MOCK_METHOD6(GetAllData,
                void(PrefetchDataMap* url_data_map,
                     PrefetchDataMap* host_data_map,
                     RedirectDataMap* url_redirect_data_map,
                     RedirectDataMap* host_redirect_data_map,
                     ManifestDataMap* manifest_data_map,
                     OriginDataMap* origin_data_map));
-  MOCK_METHOD4(UpdateData,
-               void(const PrefetchData& url_data,
-                    const PrefetchData& host_data,
-                    const RedirectData& url_redirect_data,
-                    const RedirectData& host_redirect_data));
+  MOCK_METHOD2(UpdateResourceData,
+               void(const PrefetchData& data, PrefetchKeyType key_type));
+  MOCK_METHOD2(UpdateRedirectData,
+               void(const RedirectData& data, PrefetchKeyType key_type));
   MOCK_METHOD2(UpdateManifestData,
                void(const std::string& host,
                     const precache::PrecacheManifest& manifest_data));
   MOCK_METHOD1(UpdateOriginData, void(const OriginData& origin_data));
   MOCK_METHOD2(DeleteResourceData,
                void(const std::vector<std::string>& urls,
                     const std::vector<std::string>& hosts));
   MOCK_METHOD1(DeleteOriginData, void(const std::vector<std::string>& hosts));
   MOCK_METHOD2(DeleteSingleResourceDataPoint,
                void(const std::string& key, PrefetchKeyType key_type));
@@ skipping 108 matching lines @@
 
   std::unique_ptr<ResourcePrefetchPredictor> predictor_;
   scoped_refptr<StrictMock<MockResourcePrefetchPredictorTables>> mock_tables_;
 
   PrefetchDataMap test_url_data_;
   PrefetchDataMap test_host_data_;
   RedirectDataMap test_url_redirect_data_;
   RedirectDataMap test_host_redirect_data_;
   ManifestDataMap test_manifest_data_;
   OriginDataMap test_origin_data_;
-  PrefetchData empty_resource_data_;
-  RedirectData empty_redirect_data_;
 
   MockURLRequestJobFactory url_request_job_factory_;
   EmptyURLRequestDelegate url_request_delegate_;
 
   std::unique_ptr<base::HistogramTester> histogram_tester_;
 };
 
 ResourcePrefetchPredictorTest::ResourcePrefetchPredictorTest()
     : thread_bundle_(),
       profile_(new TestingProfile()),
-      mock_tables_(new StrictMock<MockResourcePrefetchPredictorTables>()),
-      empty_resource_data_(),
-      empty_redirect_data_() {}
+      mock_tables_(new StrictMock<MockResourcePrefetchPredictorTables>()) {}
 
 ResourcePrefetchPredictorTest::~ResourcePrefetchPredictorTest() {
   profile_.reset(NULL);
   base::RunLoop().RunUntilIdle();
 }
 
 void ResourcePrefetchPredictorTest::SetUp() {
   InitializeSampleData();
 
   ASSERT_TRUE(profile_->CreateHistoryService(true, false));
@@ skipping 189 matching lines @@
   if (predictor_initial_key != predictor_key) {
     RedirectData redirect = CreateRedirectData(predictor_initial_key, 1);
     InitializeRedirectStat(redirect.add_redirect_endpoints(), predictor_key, 10,
                            0, 0);
     predictor_->host_redirect_table_cache_->insert(
         std::make_pair(redirect.primary_key(), redirect));
   }
 
   // Navigation simulation.
   using testing::_;
-  EXPECT_CALL(*mock_tables_.get(), UpdateData(_, _, _, _))
-      .Times(testing::AtLeast(1));
+  EXPECT_CALL(*mock_tables_.get(), UpdateResourceData(_, _));
+  EXPECT_CALL(*mock_tables_.get(), UpdateRedirectData(_, _));
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(_));
-
   URLRequestSummary initial =
       CreateURLRequestSummary(1, navigation_initial_url);
   predictor_->RecordURLRequest(initial);
 
   if (navigation_initial_url != navigation_url) {
     URLRequestSummary redirect =
         CreateRedirectRequestSummary(1, navigation_initial_url, navigation_url);
     predictor_->RecordURLRedirect(redirect);
   }
   NavigationID navigation_id = CreateNavigationID(1, navigation_url);
@@ skipping 110 matching lines @@
                          "https://google.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0,
                          net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "https://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "https://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, host_data, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
+
   OriginData origin_data = CreateOriginData("www.google.com");
   InitializeOriginStat(origin_data.add_origins(), "https://google.com/", 1, 0,
                        0, 1., false, true);
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(origin_data));
 
   RedirectData host_redirect_data = CreateRedirectData("www.google.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "www.google.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 // Single navigation that will be recorded. Will check for duplicate
 // resources and also for number of resources saved.
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlNotInDB) {
   const int kVisitCount = 4;
   AddUrlToHistory("http://www.google.com", kVisitCount);
@@ skipping 69 matching lines @@
       url_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
   InitializeResourceData(url_data.add_resources(),
                          "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_resource_data_, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(url_data, PREFETCH_KEY_TYPE_URL));
 
   OriginData origin_data = CreateOriginData("www.google.com");
   InitializeOriginStat(origin_data.add_origins(), "http://static.google.com/",
                        1, 0, 0, 2., true, true);
   InitializeOriginStat(origin_data.add_origins(), "http://dev.null.google.com/",
                        1, 0, 0, 4., true, true);
   InitializeOriginStat(origin_data.add_origins(), "http://google.com/", 1, 0, 0,
                        1., false, true);
   InitializeOriginStat(origin_data.add_origins(), "http://reader.google.com/",
                        1, 0, 0, 3., false, true);
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(origin_data));
 
   PrefetchData host_data = CreatePrefetchData("www.google.com");
   host_data.mutable_resources()->CopyFrom(url_data.resources());
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, host_data, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://www.google.com/");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "http://www.google.com/", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         url_redirect_data, empty_redirect_data_));
+              UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("www.google.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "www.google.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 // Tests that navigation is recorded correctly for URL already present in
 // the database cache.
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlInDB) {
   const int kVisitCount = 4;
   AddUrlToHistory("http://www.google.com", kVisitCount);
@@ skipping 70 matching lines @@
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script4.js",
       content::RESOURCE_TYPE_SCRIPT, 11, 1, 1, 2.1, net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "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_resource_data_, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(url_data, PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_.get(),
               DeleteSingleResourceDataPoint("www.facebook.com",
                                             PREFETCH_KEY_TYPE_HOST));
 
   PrefetchData host_data = CreatePrefetchData("www.google.com");
   InitializeResourceData(host_data.add_resources(),
                          "http://google.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0,
                          net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
   InitializeResourceData(host_data.add_resources(),
                          "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_resource_data_, host_data, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://www.google.com/");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "http://www.google.com/", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         url_redirect_data, empty_redirect_data_));
+              UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("www.google.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "www.google.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   OriginData origin_data = CreateOriginData("www.google.com");
   InitializeOriginStat(origin_data.add_origins(), "http://static.google.com/",
                        1, 0, 0, 2., true, true);
   InitializeOriginStat(origin_data.add_origins(), "http://google.com/", 1, 0, 0,
                        1., false, true);
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(origin_data));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
@@ skipping 53 matching lines @@
               DeleteOriginData(std::vector<std::string>({"google.com"})));
 
   PrefetchData url_data = CreatePrefetchData("http://www.nike.com/");
   InitializeResourceData(url_data.add_resources(), "http://nike.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0,
                          net::MEDIUM, false, false);
   InitializeResourceData(url_data.add_resources(), "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_resource_data_, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(url_data, PREFETCH_KEY_TYPE_URL));
 
   PrefetchData host_data = CreatePrefetchData("www.nike.com");
   host_data.mutable_resources()->CopyFrom(url_data.resources());
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, host_data, empty_redirect_data_,
-                         empty_redirect_data_));
+              UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://www.nike.com/");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "http://www.nike.com/", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         url_redirect_data, empty_redirect_data_));
+              UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("www.nike.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "www.nike.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(testing::_));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, RedirectUrlNotInDB) {
   const int kVisitCount = 4;
   AddUrlToHistory("https://facebook.com/google", kVisitCount);
@@ skipping 24 matching lines @@
   EXPECT_CALL(*mock_tables_.get(),
               DeleteSingleResourceDataPoint("https://facebook.com/google",
                                             PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_.get(), DeleteSingleResourceDataPoint(
                                        "facebook.com", PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://fb.com/google");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "https://facebook.com/google", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         url_redirect_data, empty_redirect_data_));
+              UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("fb.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "facebook.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(fb_end);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 // Tests that redirect is recorded correctly for URL already present in
 // the database cache.
 TEST_F(ResourcePrefetchPredictorTest, RedirectUrlInDB) {
   const int kVisitCount = 7;
   AddUrlToHistory("https://facebook.com/google", kVisitCount);
@@ skipping 44 matching lines @@
                                             PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_.get(), DeleteSingleResourceDataPoint(
                                        "facebook.com", PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://fb.com/google");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "https://facebook.com/google", 6, 1, 0);
   // Existing redirect to https://facebook.com/login will be deleted because of
   // too many consecutive misses.
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         url_redirect_data, empty_redirect_data_));
+              UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("fb.com");
   InitializeRedirectStat(host_redirect_data.add_redirect_endpoints(),
                          "facebook.com", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
-              UpdateData(empty_resource_data_, empty_resource_data_,
-                         empty_redirect_data_, host_redirect_data));
+              UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(fb_end);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestHostNotInDB) {
   precache::PrecacheManifest manifest = CreateManifestData(1);
   InitializePrecacheResource(manifest.add_resource(),
                              "http://cdn.google.com/script.js", 0.9);
   InitializePrecacheResource(manifest.add_resource(),
@@ skipping 774 matching lines @@
   predictor_->url_table_cache_->insert(
       std::make_pair(www_google_url.primary_key(), www_google_url));
 
   urls.clear();
   EXPECT_TRUE(predictor_->GetPrefetchData(main_frame_url, &prediction));
   EXPECT_THAT(urls, UnorderedElementsAre(GURL(font_url)));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, TestPrecisionRecallHistograms) {
   using testing::_;
-  EXPECT_CALL(*mock_tables_.get(), UpdateData(_, _, _, _)).Times(2);
+  EXPECT_CALL(*mock_tables_.get(), UpdateResourceData(_, _));
+  EXPECT_CALL(*mock_tables_.get(), UpdateRedirectData(_, _));
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(_));
 
   // Fill the database with 3 resources: 1 useful, 2 useless.
   const std::string main_frame_url = "http://google.com/?query=cats";
   PrefetchData google = CreatePrefetchData("google.com", 1);
 
   const std::string script_url = "https://cdn.google.com/script.js";
   InitializeResourceData(google.add_resources(), script_url,
                          content::RESOURCE_TYPE_SCRIPT, 10, 0, 1, 2.1,
                          net::MEDIUM, false, false);
@@ skipping 87 matching lines @@
   predictor_->host_table_cache_->insert(
       std::make_pair(google.primary_key(), google));
 
   predictor_->StartPrefetching(GURL(main_frame_url), PrefetchOrigin::EXTERNAL);
   predictor_->StopPrefetching(GURL(main_frame_url));
   histogram_tester_->ExpectTotalCount(
       internal::kResourcePrefetchPredictorPrefetchingDurationHistogram, 1);
 }
 
 }  // namespace predictors