predictors: Remove unused field from the resource_prefetch_predictor database.

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 <set>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
@@ skipping 153 matching lines @@
   PrefetchDataMap expected_host_data;
   AddKey(&expected_host_data, "www.yahoo.com");
 
   TestPrefetchDataAreEqual(expected_url_data, actual_url_data);
   TestPrefetchDataAreEqual(expected_host_data, actual_host_data);
 }
 
 void ResourcePrefetchPredictorTablesTest::TestUpdateData() {
   PrefetchData google(PREFETCH_KEY_TYPE_URL, "http://www.google.com");
   google.last_visit = base::Time::FromInternalValue(10);
-  google.resources.push_back(ResourceRow(std::string(),
-                                         "http://www.google.com/style.css",
+  google.resources.push_back(ResourceRow("http://www.google.com/style.css",
                                          content::RESOURCE_TYPE_STYLESHEET, 6,
                                          2, 0, 1.0, net::MEDIUM, true, false));
-  google.resources.push_back(ResourceRow(
-      std::string(), "http://www.google.com/image.png",
-      content::RESOURCE_TYPE_IMAGE, 6, 4, 1, 4.2, net::MEDIUM, false, false));
-  google.resources.push_back(ResourceRow(std::string(),
-                                         "http://www.google.com/a.xml",
+  google.resources.push_back(ResourceRow("http://www.google.com/image.png",
+                                         content::RESOURCE_TYPE_IMAGE, 6, 4, 1,
+                                         4.2, net::MEDIUM, false, false));
+  google.resources.push_back(ResourceRow("http://www.google.com/a.xml",
                                          content::RESOURCE_TYPE_LAST_TYPE, 1, 0,
                                          0, 6.1, net::MEDIUM, false, false));
   google.resources.push_back(ResourceRow(
-      std::string(), "http://www.resources.google.com/script.js",
+      "http://www.resources.google.com/script.js",
       content::RESOURCE_TYPE_SCRIPT, 12, 0, 0, 8.5, net::MEDIUM, true, true));
 
   PrefetchData yahoo(PREFETCH_KEY_TYPE_HOST, "www.yahoo.com");
   yahoo.last_visit = base::Time::FromInternalValue(7);
-  yahoo.resources.push_back(ResourceRow(
-      std::string(), "http://www.yahoo.com/image.png",
-      content::RESOURCE_TYPE_IMAGE, 120, 1, 1, 10.0, net::MEDIUM, true, false));
+  yahoo.resources.push_back(ResourceRow("http://www.yahoo.com/image.png",
+                                        content::RESOURCE_TYPE_IMAGE, 120, 1, 1,
+                                        10.0, net::MEDIUM, true, false));
 
   tables_->UpdateData(google, yahoo);
 
   PrefetchDataMap actual_url_data, actual_host_data;
   tables_->GetAllData(&actual_url_data, &actual_host_data);
 
   PrefetchDataMap expected_url_data, expected_host_data;
   AddKey(&expected_url_data, "http://www.reddit.com");
   AddKey(&expected_url_data, "http://www.yahoo.com");
   expected_url_data.insert(std::make_pair("http://www.google.com", google));
@@ skipping 12 matching lines @@
   tables_->GetAllData(&actual_url_data, &actual_host_data);
   EXPECT_TRUE(actual_url_data.empty());
   EXPECT_TRUE(actual_host_data.empty());
 }
 
 void ResourcePrefetchPredictorTablesTest::TestPrefetchDataAreEqual(
     const PrefetchDataMap& lhs,
     const PrefetchDataMap& rhs) const {
   EXPECT_EQ(lhs.size(), rhs.size());
 
-  for (PrefetchDataMap::const_iterator rhs_it = rhs.begin();
-       rhs_it != rhs.end(); ++rhs_it) {
-    PrefetchDataMap::const_iterator lhs_it = lhs.find(rhs_it->first);
-    ASSERT_TRUE(lhs_it != lhs.end()) << rhs_it->first;
+  for (const std::pair<std::string, PrefetchData>& p : rhs) {
+    PrefetchDataMap::const_iterator lhs_it = lhs.find(p.first);
+    ASSERT_TRUE(lhs_it != lhs.end()) << p.first;
 
-    TestResourceRowsAreEqual(lhs_it->second.resources,
-                             rhs_it->second.resources);
+    TestResourceRowsAreEqual(lhs_it->second.resources, p.second.resources);
   }
 }
 
 void ResourcePrefetchPredictorTablesTest::TestResourceRowsAreEqual(
     const ResourceRows& lhs,
     const ResourceRows& rhs) const {
   EXPECT_EQ(lhs.size(), rhs.size());
 
   std::set<GURL> resources_seen;
   for (ResourceRows::const_iterator rhs_it = rhs.begin();
@@ skipping 22 matching lines @@
   }
   it = test_host_data_.find(key);
   ASSERT_TRUE(it != test_host_data_.end());
   m->insert(std::make_pair(it->first, it->second));
 }
 
 void ResourcePrefetchPredictorTablesTest::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(std::string(), "http://www.google.com/style.css",
-                    content::RESOURCE_TYPE_STYLESHEET, 5, 2, 1, 1.1,
-                    net::MEDIUM, false, false));
-    google.resources.push_back(ResourceRow(std::string(),
-                                           "http://www.google.com/script.js",
+    google.resources.push_back(ResourceRow(
+        "http://www.google.com/style.css", content::RESOURCE_TYPE_STYLESHEET, 5,
+        2, 1, 1.1, net::MEDIUM, false, false));
+    google.resources.push_back(ResourceRow("http://www.google.com/script.js",
                                            content::RESOURCE_TYPE_SCRIPT, 4, 0,
                                            1, 2.1, net::MEDIUM, false, false));
+    google.resources.push_back(ResourceRow("http://www.google.com/image.png",
+                                           content::RESOURCE_TYPE_IMAGE, 6, 3,
+                                           0, 2.2, net::MEDIUM, false, false));
     google.resources.push_back(ResourceRow(
-        std::string(), "http://www.google.com/image.png",
-        content::RESOURCE_TYPE_IMAGE, 6, 3, 0, 2.2, net::MEDIUM, false, false));
+        "http://www.google.com/a.font", content::RESOURCE_TYPE_LAST_TYPE, 2, 0,
+        0, 5.1, net::MEDIUM, false, false));
     google.resources.push_back(
-        ResourceRow(std::string(), "http://www.google.com/a.font",
-                    content::RESOURCE_TYPE_LAST_TYPE, 2, 0, 0, 5.1, net::MEDIUM,
-                    false, false));
-    google.resources.push_back(
-        ResourceRow(std::string(), "http://www.resources.google.com/script.js",
+        ResourceRow("http://www.resources.google.com/script.js",
                     content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 8.5, 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(std::string(), "http://reddit-resource.com/script1.js",
-                    content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 1.0, net::MEDIUM,
-                    false, false));
-    reddit.resources.push_back(
-        ResourceRow(std::string(), "http://reddit-resource.com/script2.js",
-                    content::RESOURCE_TYPE_SCRIPT, 2, 0, 0, 2.1, net::MEDIUM,
-                    false, false));
+    reddit.resources.push_back(ResourceRow(
+        "http://reddit-resource.com/script1.js", content::RESOURCE_TYPE_SCRIPT,
+        4, 0, 1, 1.0, net::MEDIUM, false, false));
+    reddit.resources.push_back(ResourceRow(
+        "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(std::string(),
-                                          "http://www.google.com/image.png",
+    yahoo.resources.push_back(ResourceRow("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("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));
 
     PrefetchData empty_host_data(PREFETCH_KEY_TYPE_HOST, std::string());
     tables_->UpdateData(google, empty_host_data);
     tables_->UpdateData(reddit, empty_host_data);
     tables_->UpdateData(yahoo, empty_host_data);
   }
 
   {  // Host data.
     PrefetchData facebook(PREFETCH_KEY_TYPE_HOST, "www.facebook.com");
     facebook.last_visit = base::Time::FromInternalValue(4);
+    facebook.resources.push_back(ResourceRow(
+        "http://www.facebook.com/style.css", content::RESOURCE_TYPE_STYLESHEET,
+        5, 2, 1, 1.1, net::MEDIUM, false, false));
+    facebook.resources.push_back(ResourceRow(
+        "http://www.facebook.com/script.js", content::RESOURCE_TYPE_SCRIPT, 4,
+        0, 1, 2.1, net::MEDIUM, false, false));
+    facebook.resources.push_back(ResourceRow(
+        "http://www.facebook.com/image.png", content::RESOURCE_TYPE_IMAGE, 6, 3,
+        0, 2.2, net::MEDIUM, false, false));
+    facebook.resources.push_back(ResourceRow(
+        "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(std::string(), "http://www.facebook.com/style.css",
-                    content::RESOURCE_TYPE_STYLESHEET, 5, 2, 1, 1.1,
-                    net::MEDIUM, false, false));
-    facebook.resources.push_back(
-        ResourceRow(std::string(), "http://www.facebook.com/script.js",
-                    content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 2.1, net::MEDIUM,
+        ResourceRow("http://www.resources.facebook.com/script.js",
+                    content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 8.5, net::MEDIUM,
                     false, false));
-    facebook.resources.push_back(ResourceRow(
-        std::string(), "http://www.facebook.com/image.png",
-        content::RESOURCE_TYPE_IMAGE, 6, 3, 0, 2.2, net::MEDIUM, false, false));
-    facebook.resources.push_back(
-        ResourceRow(std::string(), "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(
-        std::string(), "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(std::string(),
-                                          "http://www.google.com/image.png",
+    yahoo.resources.push_back(ResourceRow("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("www.facebook.com", facebook));
     test_host_data_.insert(std::make_pair("www.yahoo.com", yahoo));
 
     PrefetchData empty_url_data(PREFETCH_KEY_TYPE_URL, std::string());
     tables_->UpdateData(empty_url_data, facebook);
     tables_->UpdateData(empty_url_data, yahoo);
   }
 }
 
 void ResourcePrefetchPredictorTablesTest::ReopenDatabase() {
   db_.reset(new PredictorDatabase(&profile_));
   base::RunLoop().RunUntilIdle();
   tables_ = db_->resource_prefetch_tables();
 }
 
 // Test cases.
 
 TEST_F(ResourcePrefetchPredictorTablesTest, ComputeScore) {
   typedef ResourcePrefetchPredictorTables::ResourceRow ResourceRow;
-  ResourceRow js_resource(
-      std::string(), "http://www.resources.google.com/script.js",
-      content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 1., net::MEDIUM, false, false);
-  ResourceRow image_resource(
-      std::string(), "http://www.resources.google.com/image.jpg",
-      content::RESOURCE_TYPE_IMAGE, 11, 0, 0, 1., net::MEDIUM, false, false);
-  ResourceRow css_resource(std::string(),
-                           "http://www.resources.google.com/stylesheet.css",
+  ResourceRow js_resource("http://www.resources.google.com/script.js",
+                          content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 1.,
+                          net::MEDIUM, false, false);
+  ResourceRow image_resource("http://www.resources.google.com/image.jpg",
+                             content::RESOURCE_TYPE_IMAGE, 11, 0, 0, 1.,
+                             net::MEDIUM, false, false);
+  ResourceRow css_resource("http://www.resources.google.com/stylesheet.css",
                            content::RESOURCE_TYPE_STYLESHEET, 11, 0, 0, 1.,
                            net::MEDIUM, false, false);
-  ResourceRow font_resource(std::string(),
-                            "http://www.resources.google.com/font.woff",
+  ResourceRow font_resource("http://www.resources.google.com/font.woff",
                             content::RESOURCE_TYPE_FONT_RESOURCE, 11, 0, 0, 1.,
                             net::MEDIUM, false, false);
   EXPECT_TRUE(js_resource.score == css_resource.score);
   EXPECT_TRUE(js_resource.score == font_resource.score);
   EXPECT_NEAR(199., js_resource.score, 1e-4);
   EXPECT_NEAR(99., image_resource.score, 1e-4);
 }
 
 TEST_F(ResourcePrefetchPredictorTablesTest, GetAllData) {
   TestGetAllData();
@@ skipping 54 matching lines @@
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteSingleDataPoint) {
   TestDeleteSingleDataPoint();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteAllData) {
   TestDeleteAllData();
 }
 
 }  // namespace predictors