predictors: Refactor UpdateData() function.

chrome/browser/predictors/resource_prefetch_predictor_tables_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 <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 273 matching lines @@
   InitializeResourceData(
       google.add_resources(), "http://www.google.com/image.png",
       content::RESOURCE_TYPE_IMAGE, 6, 4, 1, 4.2, net::MEDIUM, false, false);
   InitializeResourceData(google.add_resources(), "http://www.google.com/a.xml",
                          content::RESOURCE_TYPE_LAST_TYPE, 1, 0, 0, 6.1,
                          net::MEDIUM, false, false);
   InitializeResourceData(
       google.add_resources(), "http://www.resources.google.com/script.js",
       content::RESOURCE_TYPE_SCRIPT, 12, 0, 0, 8.5, net::MEDIUM, true, true);
 
+  tables_->UpdateResourceData(google, PREFETCH_KEY_TYPE_URL);
+
   PrefetchData yahoo = CreatePrefetchData("www.yahoo.com", 7);
   InitializeResourceData(
       yahoo.add_resources(), "http://www.yahoo.com/image.png",
       content::RESOURCE_TYPE_IMAGE, 120, 1, 1, 10.0, net::MEDIUM, true, false);
 
+  tables_->UpdateResourceData(yahoo, PREFETCH_KEY_TYPE_HOST);
+
   RedirectData facebook = CreateRedirectData("http://fb.com/google", 20);
   InitializeRedirectStat(facebook.add_redirect_endpoints(),
                          "https://facebook.fr/google", 4, 2, 1);
 
+  tables_->UpdateRedirectData(facebook, PREFETCH_KEY_TYPE_URL);
+
   RedirectData microsoft = CreateRedirectData("microsoft.com", 21);
   InitializeRedirectStat(microsoft.add_redirect_endpoints(), "m.microsoft.com",
                          5, 7, 1);
   InitializeRedirectStat(microsoft.add_redirect_endpoints(), "microsoft.org", 7,
                          2, 0);
 
-  tables_->UpdateData(google, yahoo, facebook, microsoft);
+  tables_->UpdateRedirectData(microsoft, PREFETCH_KEY_TYPE_HOST);
 
   precache::PrecacheManifest theverge;
   InitializePrecacheResource(theverge.add_resource(),
                              "https://www.theverge.com/main.js", 0.7);
 
   tables_->UpdateManifestData("theverge.com", theverge);
 
   OriginData twitter = CreateOriginData("twitter.com");
   InitializeOriginStat(twitter.add_origins(), "https://dogs.twitter.com", 10, 1,
                        0, 12., false, true);
@@ skipping 262 matching lines @@
 }
 
 void ResourcePrefetchPredictorTablesTest::AddKey(OriginDataMap* m,
                                                  const std::string& key) const {
   auto it = test_origin_data_.find(key);
   ASSERT_TRUE(it != test_origin_data_.end());
   m->insert(*it);
 }
 
 void ResourcePrefetchPredictorTablesTest::InitializeSampleData() {
-  PrefetchData empty_resource_data;
-  RedirectData empty_redirect_data;
-
   {  // Url data.
     PrefetchData google = CreatePrefetchData("http://www.google.com", 1);
     InitializeResourceData(google.add_resources(),
                            "http://www.google.com/style.css",
                            content::RESOURCE_TYPE_STYLESHEET, 5, 2, 1, 1.1,
                            net::MEDIUM, false, false);
     InitializeResourceData(
         google.add_resources(), "http://www.google.com/script.js",
         content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 2.1, net::MEDIUM, false, false);
     InitializeResourceData(
@@ skipping 20 matching lines @@
     InitializeResourceData(yahoo.add_resources(),
                            "http://www.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(google.primary_key(), google));
     test_url_data_.insert(std::make_pair(reddit.primary_key(), reddit));
     test_url_data_.insert(std::make_pair(yahoo.primary_key(), yahoo));
 
-    tables_->UpdateData(google, empty_resource_data, empty_redirect_data,
-                        empty_redirect_data);
-    tables_->UpdateData(reddit, empty_resource_data, empty_redirect_data,
-                        empty_redirect_data);
-    tables_->UpdateData(yahoo, empty_resource_data, empty_redirect_data,
-                        empty_redirect_data);
+    tables_->UpdateResourceData(google, PREFETCH_KEY_TYPE_URL);
+    tables_->UpdateResourceData(reddit, PREFETCH_KEY_TYPE_URL);
+    tables_->UpdateResourceData(yahoo, PREFETCH_KEY_TYPE_URL);
   }
 
   {  // Host data.
     PrefetchData facebook = CreatePrefetchData("www.facebook.com", 4);
     InitializeResourceData(facebook.add_resources(),
                            "http://www.facebook.com/style.css",
                            content::RESOURCE_TYPE_STYLESHEET, 5, 2, 1, 1.1,
                            net::MEDIUM, false, false);
     InitializeResourceData(
         facebook.add_resources(), "http://www.facebook.com/script.js",
@@ skipping 13 matching lines @@
     PrefetchData yahoo = CreatePrefetchData("www.yahoo.com", 5);
     InitializeResourceData(yahoo.add_resources(),
                            "http://www.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(facebook.primary_key(), facebook));
     test_host_data_.insert(std::make_pair(yahoo.primary_key(), yahoo));
 
-    tables_->UpdateData(empty_resource_data, facebook, empty_redirect_data,
-                        empty_redirect_data);
-    tables_->UpdateData(empty_resource_data, yahoo, empty_redirect_data,
-                        empty_redirect_data);
+    tables_->UpdateResourceData(facebook, PREFETCH_KEY_TYPE_HOST);
+    tables_->UpdateResourceData(yahoo, PREFETCH_KEY_TYPE_HOST);
   }
 
   {  // Url redirect data.
     RedirectData facebook = CreateRedirectData("http://fb.com/google", 6);
     InitializeRedirectStat(facebook.add_redirect_endpoints(),
                            "https://facebook.com/google", 5, 1, 0);
     InitializeRedirectStat(facebook.add_redirect_endpoints(),
                            "https://facebook.com/login", 3, 5, 1);
 
     RedirectData nytimes = CreateRedirectData("http://nyt.com", 7);
     InitializeRedirectStat(nytimes.add_redirect_endpoints(),
                            "https://nytimes.com", 2, 0, 0);
 
     RedirectData google = CreateRedirectData("http://google.com", 8);
     InitializeRedirectStat(google.add_redirect_endpoints(),
                            "https://google.com", 3, 0, 0);
 
     test_url_redirect_data_.clear();
     test_url_redirect_data_.insert(
         std::make_pair(facebook.primary_key(), facebook));
     test_url_redirect_data_.insert(
         std::make_pair(nytimes.primary_key(), nytimes));
     test_url_redirect_data_.insert(
         std::make_pair(google.primary_key(), google));
 
-    tables_->UpdateData(empty_resource_data, empty_resource_data, facebook,
-                        empty_redirect_data);
-    tables_->UpdateData(empty_resource_data, empty_resource_data, nytimes,
-                        empty_redirect_data);
-    tables_->UpdateData(empty_resource_data, empty_resource_data, google,
-                        empty_redirect_data);
+    tables_->UpdateRedirectData(facebook, PREFETCH_KEY_TYPE_URL);
+    tables_->UpdateRedirectData(nytimes, PREFETCH_KEY_TYPE_URL);
+    tables_->UpdateRedirectData(google, PREFETCH_KEY_TYPE_URL);
   }
 
   {  // Host redirect data.
     RedirectData bbc = CreateRedirectData("bbc.com", 9);
     InitializeRedirectStat(bbc.add_redirect_endpoints(), "www.bbc.com", 8, 4,
                            1);
     InitializeRedirectStat(bbc.add_redirect_endpoints(), "m.bbc.com", 5, 8, 0);
     InitializeRedirectStat(bbc.add_redirect_endpoints(), "bbc.co.uk", 1, 3, 0);
 
     RedirectData microsoft = CreateRedirectData("microsoft.com", 10);
     InitializeRedirectStat(microsoft.add_redirect_endpoints(),
                            "www.microsoft.com", 10, 0, 0);
 
     test_host_redirect_data_.clear();
     test_host_redirect_data_.insert(std::make_pair(bbc.primary_key(), bbc));
     test_host_redirect_data_.insert(
         std::make_pair(microsoft.primary_key(), microsoft));
-    tables_->UpdateData(empty_resource_data, empty_resource_data,
-                        empty_redirect_data, bbc);
-    tables_->UpdateData(empty_resource_data, empty_resource_data,
-                        empty_redirect_data, microsoft);
+
+    tables_->UpdateRedirectData(bbc, PREFETCH_KEY_TYPE_HOST);
+    tables_->UpdateRedirectData(microsoft, PREFETCH_KEY_TYPE_HOST);
   }
 
   {  // Manifest data.
     precache::PrecacheManifest wikipedia;
     InitializePrecacheResource(wikipedia.add_resource(),
                                "https://en.wikipedia.org/script.js", 0.7);
     InitializePrecacheResource(wikipedia.add_resource(),
                                "https://en.wikipedia.org/image.png", 0.3);
 
     precache::PrecacheManifest youtube;
@@ skipping 192 matching lines @@
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteSingleDataPoint) {
   TestDeleteSingleDataPoint();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteAllData) {
   TestDeleteAllData();
 }
 
 }  // namespace predictors