Rewrite std::string("") to std::string(), Linux edition.

chrome/browser/predictors/resource_prefetch_predictor_unittest.cc

 // Copyright (c) 2012 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 <iostream>
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time.h"
@@ skipping 158 matching lines @@
   PrefetchData empty_host_data_;
 };
 
 ResourcePrefetchPredictorTest::ResourcePrefetchPredictorTest()
     : loop_(MessageLoop::TYPE_DEFAULT),
       ui_thread_(content::BrowserThread::UI, &loop_),
       db_thread_(content::BrowserThread::DB, &loop_),
       profile_(new TestingProfile()),
       predictor_(NULL),
       mock_tables_(new StrictMock<MockResourcePrefetchPredictorTables>()),
-      empty_url_data_(PREFETCH_KEY_TYPE_URL, ""),
-      empty_host_data_(PREFETCH_KEY_TYPE_HOST, "") {
-}
+      empty_url_data_(PREFETCH_KEY_TYPE_URL, std::string()),
+      empty_host_data_(PREFETCH_KEY_TYPE_HOST, std::string()) {}
 
 ResourcePrefetchPredictorTest::~ResourcePrefetchPredictorTest() {
   profile_.reset(NULL);
   loop_.RunUntilIdle();
 }
 
 void ResourcePrefetchPredictorTest::SetUp() {
   InitializeSampleData();
 
   profile_->CreateHistoryService(true, false);
@@ skipping 15 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(
-        "",
-        "http://google.com/style1.css",
-        ResourceType::STYLESHEET,
-        3, 2, 1, 1.0));
-    google.resources.push_back(ResourceRow(
-        "",
-        "http://google.com/script3.js",
-        ResourceType::SCRIPT,
-        4, 0, 1, 2.1));
-    google.resources.push_back(ResourceRow(
-        "",
-        "http://google.com/script4.js",
-        ResourceType::SCRIPT,
-        11, 0, 0, 2.1));
-    google.resources.push_back(ResourceRow(
-        "",
-        "http://google.com/image1.png",
-        ResourceType::IMAGE,
-        6, 3, 0, 2.2));
-    google.resources.push_back(ResourceRow(
-        "",
-        "http://google.com/a.font",
-        ResourceType::LAST_TYPE,
-        2, 0, 0, 5.1));
+    google.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/style1.css",
+                                           ResourceType::STYLESHEET,
+                                           3,
+                                           2,
+                                           1,
+                                           1.0));
+    google.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script3.js",
+                                           ResourceType::SCRIPT,
+                                           4,
+                                           0,
+                                           1,
+                                           2.1));
+    google.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script4.js",
+                                           ResourceType::SCRIPT,
+                                           11,
+                                           0,
+                                           0,
+                                           2.1));
+    google.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/image1.png",
+                                           ResourceType::IMAGE,
+                                           6,
+                                           3,
+                                           0,
+                                           2.2));
+    google.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/a.font",
+                                           ResourceType::LAST_TYPE,
+                                           2,
+                                           0,
+                                           0,
+                                           5.1));
 
     PrefetchData reddit(PREFETCH_KEY_TYPE_URL, "http://www.reddit.com/");
     reddit.last_visit = base::Time::FromInternalValue(2);
-    reddit.resources.push_back(ResourceRow(
-        "",
-        "http://reddit-resource.com/script1.js",
-        ResourceType::SCRIPT,
-        4, 0, 1, 1.0));
-    reddit.resources.push_back(ResourceRow(
-        "",
-        "http://reddit-resource.com/script2.js",
-        ResourceType::SCRIPT,
-        2, 0, 0, 2.1));
+    reddit.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://reddit-resource.com/script1.js",
+                               ResourceType::SCRIPT,
+                               4,
+                               0,
+                               1,
+                               1.0));
+    reddit.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://reddit-resource.com/script2.js",
+                               ResourceType::SCRIPT,
+                               2,
+                               0,
+                               0,
+                               2.1));
 
     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",
-        ResourceType::IMAGE,
-        20, 1, 0, 10.0));
+    yahoo.resources.push_back(ResourceRow(std::string(),
+                                          "http://google.com/image.png",
+                                          ResourceType::IMAGE,
+                                          20,
+                                          1,
+                                          0,
+                                          10.0));
 
     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(
-        "",
-        "http://www.facebook.com/style.css",
-        ResourceType::STYLESHEET,
-        5, 2, 1, 1.1));
-    facebook.resources.push_back(ResourceRow(
-        "",
-        "http://www.facebook.com/script.js",
-        ResourceType::SCRIPT,
-        4, 0, 1, 2.1));
-    facebook.resources.push_back(ResourceRow(
-        "",
-        "http://www.facebook.com/image.png",
-        ResourceType::IMAGE,
-        6, 3, 0, 2.2));
-    facebook.resources.push_back(ResourceRow(
-        "",
-        "http://www.facebook.com/a.font",
-        ResourceType::LAST_TYPE,
-        2, 0, 0, 5.1));
-    facebook.resources.push_back(ResourceRow(
-        "",
-        "http://www.resources.facebook.com/script.js",
-        ResourceType::SCRIPT,
-        11, 0, 0, 8.5));
+    facebook.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://www.facebook.com/style.css",
+                               ResourceType::STYLESHEET,
+                               5,
+                               2,
+                               1,
+                               1.1));
+    facebook.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://www.facebook.com/script.js",
+                               ResourceType::SCRIPT,
+                               4,
+                               0,
+                               1,
+                               2.1));
+    facebook.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://www.facebook.com/image.png",
+                               ResourceType::IMAGE,
+                               6,
+                               3,
+                               0,
+                               2.2));
+    facebook.resources.push_back(ResourceRow(std::string(),
+                                             "http://www.facebook.com/a.font",
+                                             ResourceType::LAST_TYPE,
+                                             2,
+                                             0,
+                                             0,
+                                             5.1));
+    facebook.resources
+        .push_back(ResourceRow(std::string(),
+                               "http://www.resources.facebook.com/script.js",
+                               ResourceType::SCRIPT,
+                               11,
+                               0,
+                               0,
+                               8.5));
 
     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",
-        ResourceType::IMAGE,
-        20, 1, 0, 10.0));
+    yahoo.resources.push_back(ResourceRow(std::string(),
+                                          "http://google.com/image.png",
+                                          ResourceType::IMAGE,
+                                          20,
+                                          1,
+                                          0,
+                                          10.0));
 
     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 20 matching lines @@
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   EXPECT_EQ(test_url_data_, *predictor_->url_table_cache_);
   EXPECT_EQ(test_host_data_, *predictor_->host_table_cache_);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, NavigationNotRecorded) {
   // Single navigation but history count is low, so should not record.
   AddUrlToHistory("http://www.google.com", 1);
 
-  URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary main_frame =
+      CreateURLRequestSummary(1,
+                              1,
+                              "http://www.google.com",
+                              "http://www.google.com",
+                              ResourceType::MAIN_FRAME,
+                              std::string(),
+                              false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   // Now add a few subresources.
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style1.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->RecordUrlResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script1.js",
       ResourceType::SCRIPT, "text/javascript", false);
   predictor_->RecordUrlResponse(resource2);
   URLRequestSummary resource3 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script2.js",
       ResourceType::SCRIPT, "text/javascript", false);
   predictor_->RecordUrlResponse(resource3);
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style1.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 1.0));
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script1.js",
-      ResourceType::SCRIPT, 1, 0, 0, 2.0));
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script2.js",
-      ResourceType::SCRIPT, 1, 0, 0, 3.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/style1.css",
+                                            ResourceType::STYLESHEET,
+                                            1,
+                                            0,
+                                            0,
+                                            1.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/script1.js",
+                                            ResourceType::SCRIPT,
+                                            1,
+                                            0,
+                                            0,
+                                            2.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/script2.js",
+                                            ResourceType::SCRIPT,
+                                            1,
+                                            0,
+                                            0,
+                                            3.0));
   EXPECT_CALL(*mock_tables_, 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);
 
-  URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary main_frame =
+      CreateURLRequestSummary(1,
+                              1,
+                              "http://www.google.com",
+                              "http://www.google.com",
+                              ResourceType::MAIN_FRAME,
+                              std::string(),
+                              false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style1.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->RecordUrlResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script1.js",
       ResourceType::SCRIPT, "text/javascript", false);
@@ skipping 17 matching lines @@
   URLRequestSummary resource7 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style2.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->OnSubresourceLoadedFromMemory(
       resource7.navigation_id,
       resource7.resource_url,
       resource7.mime_type,
       resource7.resource_type);
 
   PrefetchData url_data(PREFETCH_KEY_TYPE_URL, "http://www.google.com/");
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style1.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 1.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script1.js",
-      ResourceType::SCRIPT, 1, 0, 0, 2.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script2.js",
-      ResourceType::SCRIPT, 1, 0, 0, 3.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style2.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 7.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/style1.css",
+                                           ResourceType::STYLESHEET,
+                                           1,
+                                           0,
+                                           0,
+                                           1.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script1.js",
+                                           ResourceType::SCRIPT,
+                                           1,
+                                           0,
+                                           0,
+                                           2.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script2.js",
+                                           ResourceType::SCRIPT,
+                                           1,
+                                           0,
+                                           0,
+                                           3.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/style2.css",
+                                           ResourceType::STYLESHEET,
+                                           1,
+                                           0,
+                                           0,
+                                           7.0));
   EXPECT_CALL(*mock_tables_, 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_, UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, NavigationUrlInDB) {
   // Tests that navigation is recorded correctly for URL already present in
   // the database cache.
   AddUrlToHistory("http://www.google.com", 4);
 
   EXPECT_CALL(*mock_tables_,
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3, static_cast<int>(predictor_->url_table_cache_->size()));
   EXPECT_EQ(2, static_cast<int>(predictor_->host_table_cache_->size()));
 
-  URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary main_frame =
+      CreateURLRequestSummary(1,
+                              1,
+                              "http://www.google.com",
+                              "http://www.google.com",
+                              ResourceType::MAIN_FRAME,
+                              std::string(),
+                              false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style1.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->RecordUrlResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script1.js",
       ResourceType::SCRIPT, "text/javascript", false);
@@ skipping 17 matching lines @@
   URLRequestSummary resource7 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style2.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->OnSubresourceLoadedFromMemory(
       resource7.navigation_id,
       resource7.resource_url,
       resource7.mime_type,
       resource7.resource_type);
 
   PrefetchData url_data(PREFETCH_KEY_TYPE_URL, "http://www.google.com/");
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style1.css",
-      ResourceType::STYLESHEET, 4, 2, 0, 1.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script1.js",
-      ResourceType::SCRIPT, 1, 0, 0, 2.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script4.js",
-      ResourceType::SCRIPT, 11, 1, 1, 2.1));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script2.js",
-      ResourceType::SCRIPT, 1, 0, 0, 3.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/style1.css",
+                                           ResourceType::STYLESHEET,
+                                           4,
+                                           2,
+                                           0,
+                                           1.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script1.js",
+                                           ResourceType::SCRIPT,
+                                           1,
+                                           0,
+                                           0,
+                                           2.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script4.js",
+                                           ResourceType::SCRIPT,
+                                           11,
+                                           1,
+                                           1,
+                                           2.1));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://google.com/script2.js",
+                                           ResourceType::SCRIPT,
+                                           1,
+                                           0,
+                                           0,
+                                           3.0));
   EXPECT_CALL(*mock_tables_, UpdateData(url_data, empty_host_data_));
 
   EXPECT_CALL(*mock_tables_,
               DeleteSingleDataPoint("www.facebook.com",
                                     PREFETCH_KEY_TYPE_HOST));
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style1.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 1.0));
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script1.js",
-      ResourceType::SCRIPT, 1, 0, 0, 2.0));
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/script2.js",
-      ResourceType::SCRIPT, 1, 0, 0, 3.0));
-  host_data.resources.push_back(ResourceRow(
-      "", "http://google.com/style2.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 7.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/style1.css",
+                                            ResourceType::STYLESHEET,
+                                            1,
+                                            0,
+                                            0,
+                                            1.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/script1.js",
+                                            ResourceType::SCRIPT,
+                                            1,
+                                            0,
+                                            0,
+                                            2.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/script2.js",
+                                            ResourceType::SCRIPT,
+                                            1,
+                                            0,
+                                            0,
+                                            3.0));
+  host_data.resources.push_back(ResourceRow(std::string(),
+                                            "http://google.com/style2.css",
+                                            ResourceType::STYLESHEET,
+                                            1,
+                                            0,
+                                            0,
+                                            7.0));
   EXPECT_CALL(*mock_tables_, 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.
   AddUrlToHistory("http://www.nike.com/", 4);
 
   EXPECT_CALL(*mock_tables_,
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3, static_cast<int>(predictor_->url_table_cache_->size()));
   EXPECT_EQ(2, static_cast<int>(predictor_->host_table_cache_->size()));
 
-  URLRequestSummary main_frame = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://www.nike.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary main_frame =
+      CreateURLRequestSummary(1,
+                              1,
+                              "http://www.nike.com",
+                              "http://www.nike.com",
+                              ResourceType::MAIN_FRAME,
+                              std::string(),
+                              false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, 1, "http://www.nike.com",  "http://nike.com/style1.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->RecordUrlResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.nike.com",  "http://nike.com/image2.png",
       ResourceType::IMAGE, "image/png", false);
   predictor_->RecordUrlResponse(resource2);
 
   EXPECT_CALL(*mock_tables_,
               DeleteSingleDataPoint("http://www.google.com/",
                                     PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_,
               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(
-      "", "http://nike.com/style1.css",
-      ResourceType::STYLESHEET, 1, 0, 0, 1.0));
-  url_data.resources.push_back(ResourceRow(
-      "", "http://nike.com/image2.png",
-      ResourceType::IMAGE, 1, 0, 0, 2.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://nike.com/style1.css",
+                                           ResourceType::STYLESHEET,
+                                           1,
+                                           0,
+                                           0,
+                                           1.0));
+  url_data.resources.push_back(ResourceRow(std::string(),
+                                           "http://nike.com/image2.png",
+                                           ResourceType::IMAGE,
+                                           1,
+                                           0,
+                                           0,
+                                           2.0));
   EXPECT_CALL(*mock_tables_, 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_, UpdateData(empty_url_data_, host_data));
 
   predictor_->OnNavigationComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
@@ skipping 46 matching lines @@
   EXPECT_EQ(1, static_cast<int>(predictor_->host_table_cache_->size()));
 
   EXPECT_CALL(*mock_tables_, DeleteAllData());
 
   predictor_->DeleteAllUrls();
   EXPECT_TRUE(predictor_->url_table_cache_->empty());
   EXPECT_TRUE(predictor_->host_table_cache_->empty());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnMainFrameRequest) {
-  URLRequestSummary summary1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
-  URLRequestSummary summary2 = CreateURLRequestSummary(
-      1, 2, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
-  URLRequestSummary summary3 = CreateURLRequestSummary(
-      2, 1, "http://www.yahoo.com", "http://www.yahoo.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary summary1 = CreateURLRequestSummary(1,
+                                                       1,
+                                                       "http://www.google.com",
+                                                       "http://www.google.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
+  URLRequestSummary summary2 = CreateURLRequestSummary(1,
+                                                       2,
+                                                       "http://www.google.com",
+                                                       "http://www.google.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
+  URLRequestSummary summary3 = CreateURLRequestSummary(2,
+                                                       1,
+                                                       "http://www.yahoo.com",
+                                                       "http://www.yahoo.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
 
   predictor_->OnMainFrameRequest(summary1);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
   predictor_->OnMainFrameRequest(summary2);
   EXPECT_EQ(2, static_cast<int>(predictor_->inflight_navigations_.size()));
   predictor_->OnMainFrameRequest(summary3);
   EXPECT_EQ(3, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   // Insert anther with same navigation id. It should replace.
-  URLRequestSummary summary4 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com", "http://www.nike.com",
-      ResourceType::MAIN_FRAME, "", false);
-  URLRequestSummary summary5 = CreateURLRequestSummary(
-      1, 2, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary summary4 = CreateURLRequestSummary(1,
+                                                       1,
+                                                       "http://www.nike.com",
+                                                       "http://www.nike.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
+  URLRequestSummary summary5 = CreateURLRequestSummary(1,
+                                                       2,
+                                                       "http://www.google.com",
+                                                       "http://www.google.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
 
   predictor_->OnMainFrameRequest(summary4);
   EXPECT_EQ(3, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   // Change this creation time so that it will go away on the next insert.
   summary5.navigation_id.creation_time = base::TimeTicks::Now() -
       base::TimeDelta::FromDays(1);
   predictor_->OnMainFrameRequest(summary5);
   EXPECT_EQ(3, static_cast<int>(predictor_->inflight_navigations_.size()));
 
-  URLRequestSummary summary6 = CreateURLRequestSummary(
-      3, 1, "http://www.shoes.com", "http://www.shoes.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary summary6 = CreateURLRequestSummary(3,
+                                                       1,
+                                                       "http://www.shoes.com",
+                                                       "http://www.shoes.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
   predictor_->OnMainFrameRequest(summary6);
   EXPECT_EQ(3, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary3.navigation_id) !=
               predictor_->inflight_navigations_.end());
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary4.navigation_id) !=
               predictor_->inflight_navigations_.end());
   EXPECT_TRUE(predictor_->inflight_navigations_.find(summary6.navigation_id) !=
               predictor_->inflight_navigations_.end());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnMainFrameRedirect) {
-  URLRequestSummary summary1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
-  URLRequestSummary summary2 = CreateURLRequestSummary(
-      1, 2, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
-  URLRequestSummary summary3 = CreateURLRequestSummary(
-      2, 1, "http://www.yahoo.com", "http://www.yahoo.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary summary1 = CreateURLRequestSummary(1,
+                                                       1,
+                                                       "http://www.google.com",
+                                                       "http://www.google.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
+  URLRequestSummary summary2 = CreateURLRequestSummary(1,
+                                                       2,
+                                                       "http://www.google.com",
+                                                       "http://www.google.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
+  URLRequestSummary summary3 = CreateURLRequestSummary(2,
+                                                       1,
+                                                       "http://www.yahoo.com",
+                                                       "http://www.yahoo.com",
+                                                       ResourceType::MAIN_FRAME,
+                                                       std::string(),
+                                                       false);
 
   predictor_->OnMainFrameRedirect(summary1);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   predictor_->OnMainFrameRequest(summary1);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
   predictor_->OnMainFrameRequest(summary2);
   EXPECT_EQ(2, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   predictor_->OnMainFrameRedirect(summary3);
   EXPECT_EQ(2, static_cast<int>(predictor_->inflight_navigations_.size()));
   predictor_->OnMainFrameRedirect(summary1);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
   predictor_->OnMainFrameRedirect(summary2);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, OnSubresourceResponse) {
   // If there is no inflight navigation, nothing happens.
   URLRequestSummary resource1 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/style1.css",
       ResourceType::STYLESHEET, "text/css", false);
   predictor_->OnSubresourceResponse(resource1);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   // Add an inflight navigation.
-  URLRequestSummary main_frame1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com", "http://www.google.com",
-      ResourceType::MAIN_FRAME, "", false);
+  URLRequestSummary main_frame1 =
+      CreateURLRequestSummary(1,
+                              1,
+                              "http://www.google.com",
+                              "http://www.google.com",
+                              ResourceType::MAIN_FRAME,
+                              std::string(),
+                              false);
   predictor_->OnMainFrameRequest(main_frame1);
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
 
   // Now add a few subresources.
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script1.js",
       ResourceType::SCRIPT, "text/javascript", false);
   URLRequestSummary resource3 = CreateURLRequestSummary(
       1, 1, "http://www.google.com",  "http://google.com/script2.js",
       ResourceType::SCRIPT, "text/javascript", false);
   predictor_->OnSubresourceResponse(resource1);
   predictor_->OnSubresourceResponse(resource2);
   predictor_->OnSubresourceResponse(resource3);
 
   EXPECT_EQ(1, static_cast<int>(predictor_->inflight_navigations_.size()));
   EXPECT_EQ(3, static_cast<int>(
       predictor_->inflight_navigations_[main_frame1.navigation_id]->size()));
   EXPECT_TRUE(URLRequestSummaryAreEqual(
       resource1,
       predictor_->inflight_navigations_[main_frame1.navigation_id]->at(0)));
   EXPECT_TRUE(URLRequestSummaryAreEqual(
       resource2,
       predictor_->inflight_navigations_[main_frame1.navigation_id]->at(1)));
   EXPECT_TRUE(URLRequestSummaryAreEqual(
       resource3,
       predictor_->inflight_navigations_[main_frame1.navigation_id]->at(2)));
 }
 
 }  // namespace predictors