predictors: Add the request priority to the reource_prefetch_predictor DB.

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/ref_counted.h"
@@ skipping 92 matching lines @@
     navigation_id.creation_time = base::TimeTicks::Now();
     return navigation_id;
   }
 
   ResourcePrefetchPredictor::URLRequestSummary CreateURLRequestSummary(
       int process_id,
       int render_frame_id,
       const std::string& main_frame_url,
       const std::string& resource_url,
       content::ResourceType resource_type,
+      net::RequestPriority priority,
       const std::string& mime_type,
       bool was_cached) {
     ResourcePrefetchPredictor::URLRequestSummary summary;
     summary.navigation_id = CreateNavigationID(process_id, render_frame_id,
                                                main_frame_url);
     summary.resource_url = GURL(resource_url);
     summary.resource_type = resource_type;
+    summary.priority = priority;
     summary.mime_type = mime_type;
     summary.was_cached = was_cached;
     return summary;
   }
 
   void InitializePredictor() {
     predictor_->StartInitialization();
     base::RunLoop loop;
     loop.RunUntilIdle();  // Runs the DB lookup.
     profile_->BlockUntilHistoryProcessesPendingRequests();
@@ skipping 75 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(std::string(),
-                                           "http://google.com/style1.css",
-                                           content::RESOURCE_TYPE_STYLESHEET,
-                                           3,
-                                           2,
-                                           1,
-                                           1.0));
-    google.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script3.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           4,
-                                           0,
-                                           1,
-                                           2.1));
-    google.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script4.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           11,
-                                           0,
-                                           0,
-                                           2.1));
-    google.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/image1.png",
-                                           content::RESOURCE_TYPE_IMAGE,
-                                           6,
-                                           3,
-                                           0,
-                                           2.2));
-    google.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/a.font",
-                                           content::RESOURCE_TYPE_LAST_TYPE,
-                                           2,
-                                           0,
-                                           0,
-                                           5.1));
+    google.resources.push_back(ResourceRow(
+        std::string(), "http://google.com/style1.css",
+        content::RESOURCE_TYPE_STYLESHEET, 3, 2, 1, 1.0, net::MEDIUM));
+    google.resources.push_back(
+        ResourceRow(std::string(), "http://google.com/script3.js",
+                    content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 2.1, net::MEDIUM));
+    google.resources.push_back(
+        ResourceRow(std::string(), "http://google.com/script4.js",
+                    content::RESOURCE_TYPE_SCRIPT, 11, 0, 0, 2.1, net::MEDIUM));
+    google.resources.push_back(
+        ResourceRow(std::string(), "http://google.com/image1.png",
+                    content::RESOURCE_TYPE_IMAGE, 6, 3, 0, 2.2, net::MEDIUM));
+    google.resources.push_back(ResourceRow(
+        std::string(), "http://google.com/a.font",
+        content::RESOURCE_TYPE_LAST_TYPE, 2, 0, 0, 5.1, net::MEDIUM));
 
     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));
-    reddit.resources
-        .push_back(ResourceRow(std::string(),
-                               "http://reddit-resource.com/script2.js",
-                               content::RESOURCE_TYPE_SCRIPT,
-                               2,
-                               0,
-                               0,
-                               2.1));
+    reddit.resources.push_back(
+        ResourceRow(std::string(), "http://reddit-resource.com/script1.js",
+                    content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 1.0, net::MEDIUM));
+    reddit.resources.push_back(
+        ResourceRow(std::string(), "http://reddit-resource.com/script2.js",
+                    content::RESOURCE_TYPE_SCRIPT, 2, 0, 0, 2.1, net::MEDIUM));
 
     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://google.com/image.png",
-                                          content::RESOURCE_TYPE_IMAGE,
-                                          20,
-                                          1,
-                                          0,
-                                          10.0));
+    yahoo.resources.push_back(
+        ResourceRow(std::string(), "http://google.com/image.png",
+                    content::RESOURCE_TYPE_IMAGE, 20, 1, 0, 10.0, net::MEDIUM));
 
     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(std::string(),
-                               "http://www.facebook.com/style.css",
-                               content::RESOURCE_TYPE_STYLESHEET,
-                               5,
-                               2,
-                               1,
-                               1.1));
-    facebook.resources
-        .push_back(ResourceRow(std::string(),
-                               "http://www.facebook.com/script.js",
-                               content::RESOURCE_TYPE_SCRIPT,
-                               4,
-                               0,
-                               1,
-                               2.1));
-    facebook.resources
-        .push_back(ResourceRow(std::string(),
-                               "http://www.facebook.com/image.png",
-                               content::RESOURCE_TYPE_IMAGE,
-                               6,
-                               3,
-                               0,
-                               2.2));
-    facebook.resources.push_back(ResourceRow(std::string(),
-                                             "http://www.facebook.com/a.font",
-                                             content::RESOURCE_TYPE_LAST_TYPE,
-                                             2,
-                                             0,
-                                             0,
-                                             5.1));
-    facebook.resources
-        .push_back(ResourceRow(std::string(),
-                               "http://www.resources.facebook.com/script.js",
-                               content::RESOURCE_TYPE_SCRIPT,
-                               11,
-                               0,
-                               0,
-                               8.5));
+    facebook.resources.push_back(ResourceRow(
+        std::string(), "http://www.facebook.com/style.css",
+        content::RESOURCE_TYPE_STYLESHEET, 5, 2, 1, 1.1, net::MEDIUM));
+    facebook.resources.push_back(
+        ResourceRow(std::string(), "http://www.facebook.com/script.js",
+                    content::RESOURCE_TYPE_SCRIPT, 4, 0, 1, 2.1, net::MEDIUM));
+    facebook.resources.push_back(
+        ResourceRow(std::string(), "http://www.facebook.com/image.png",
+                    content::RESOURCE_TYPE_IMAGE, 6, 3, 0, 2.2, net::MEDIUM));
+    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));
+    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));
 
     PrefetchData yahoo(PREFETCH_KEY_TYPE_HOST, "www.yahoo.com");
     yahoo.last_visit = base::Time::FromInternalValue(5);
-    yahoo.resources.push_back(ResourceRow(std::string(),
-                                          "http://google.com/image.png",
-                                          content::RESOURCE_TYPE_IMAGE,
-                                          20,
-                                          1,
-                                          0,
-                                          10.0));
+    yahoo.resources.push_back(
+        ResourceRow(std::string(), "http://google.com/image.png",
+                    content::RESOURCE_TYPE_IMAGE, 20, 1, 0, 10.0, net::MEDIUM));
 
     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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   // Now add a few subresources.
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/style1.css",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", false);
+      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, "text/javascript", false);
+      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(std::string(),
-                                            "http://google.com/style1.css",
-                                            content::RESOURCE_TYPE_STYLESHEET,
-                                            1,
-                                            0,
-                                            0,
-                                            1.0));
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/script1.js",
-                                            content::RESOURCE_TYPE_SCRIPT,
-                                            1,
-                                            0,
-                                            0,
-                                            2.0));
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/script2.js",
-                                            content::RESOURCE_TYPE_SCRIPT,
-                                            1,
-                                            0,
-                                            0,
-                                            3.0));
+  host_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0, net::MEDIUM));
+  host_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script1.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM));
+  host_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script2.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM));
   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);
 
-  URLRequestSummary main_frame =
-      CreateURLRequestSummary(1,
-                              1,
-                              "http://www.google.com",
-                              "http://www.google.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/style1.css",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", false);
+      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, "text/javascript", false);
+      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
   URLRequestSummary resource4 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", true);
+      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", true);
   predictor_->RecordURLResponse(resource4);
   URLRequestSummary resource5 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/image1.png",
-      content::RESOURCE_TYPE_IMAGE, "image/png", false);
+      1, 1, "http://www.google.com", "http://google.com/image1.png",
+      content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource5);
   URLRequestSummary resource6 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/image2.png",
-      content::RESOURCE_TYPE_IMAGE, "image/png", false);
+      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, "text/css", true);
+      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(std::string(),
-                                           "http://google.com/style1.css",
-                                           content::RESOURCE_TYPE_STYLESHEET,
-                                           1,
-                                           0,
-                                           0,
-                                           1.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script1.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           1,
-                                           0,
-                                           0,
-                                           2.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script2.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           1,
-                                           0,
-                                           0,
-                                           3.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/style2.css",
-                                           content::RESOURCE_TYPE_STYLESHEET,
-                                           1,
-                                           0,
-                                           0,
-                                           7.0));
+  url_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script1.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script2.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM));
+  url_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style2.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0, net::MEDIUM));
   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();
 }
 
 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_.get(),
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3U, predictor_->url_table_cache_->size());
   EXPECT_EQ(2U, predictor_->host_table_cache_->size());
 
-  URLRequestSummary main_frame =
-      CreateURLRequestSummary(1,
-                              1,
-                              "http://www.google.com",
-                              "http://www.google.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/style1.css",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", false);
+      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, "text/javascript", false);
+      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
   URLRequestSummary resource4 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", true);
+      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", true);
   predictor_->RecordURLResponse(resource4);
   URLRequestSummary resource5 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/image1.png",
-      content::RESOURCE_TYPE_IMAGE, "image/png", false);
+      1, 1, "http://www.google.com", "http://google.com/image1.png",
+      content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource5);
   URLRequestSummary resource6 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/image2.png",
-      content::RESOURCE_TYPE_IMAGE, "image/png", false);
+      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, "text/css", true);
+      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(std::string(),
-                                           "http://google.com/style1.css",
-                                           content::RESOURCE_TYPE_STYLESHEET,
-                                           4,
-                                           2,
-                                           0,
-                                           1.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script1.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           1,
-                                           0,
-                                           0,
-                                           2.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script4.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           11,
-                                           1,
-                                           1,
-                                           2.1));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://google.com/script2.js",
-                                           content::RESOURCE_TYPE_SCRIPT,
-                                           1,
-                                           0,
-                                           0,
-                                           3.0));
+  url_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 4, 2, 0, 1.0, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script1.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script4.js",
+                  content::RESOURCE_TYPE_SCRIPT, 11, 1, 1, 2.1, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script2.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM));
   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(std::string(),
-                                            "http://google.com/style1.css",
-                                            content::RESOURCE_TYPE_STYLESHEET,
-                                            1,
-                                            0,
-                                            0,
-                                            1.0));
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/script1.js",
-                                            content::RESOURCE_TYPE_SCRIPT,
-                                            1,
-                                            0,
-                                            0,
-                                            2.0));
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/script2.js",
-                                            content::RESOURCE_TYPE_SCRIPT,
-                                            1,
-                                            0,
-                                            0,
-                                            3.0));
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/style2.css",
-                                            content::RESOURCE_TYPE_STYLESHEET,
-                                            1,
-                                            0,
-                                            0,
-                                            7.0));
+  host_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0, net::MEDIUM));
+  host_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script1.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM));
+  host_data.resources.push_back(
+      ResourceRow(std::string(), "http://google.com/script2.js",
+                  content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM));
+  host_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style2.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0, net::MEDIUM));
   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.
   AddUrlToHistory("http://www.nike.com/", 4);
 
   EXPECT_CALL(*mock_tables_.get(),
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap()))))
       .WillOnce(DoAll(SetArgPointee<0>(test_url_data_),
                       SetArgPointee<1>(test_host_data_)));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(3U, predictor_->url_table_cache_->size());
   EXPECT_EQ(2U, predictor_->host_table_cache_->size());
 
-  URLRequestSummary main_frame =
-      CreateURLRequestSummary(1,
-                              1,
-                              "http://www.nike.com",
-                              "http://www.nike.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame = CreateURLRequestSummary(
+      1, 1, "http://www.nike.com", "http://www.nike.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com",  "http://nike.com/style1.css",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.nike.com", "http://nike.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.nike.com",  "http://nike.com/image2.png",
-      content::RESOURCE_TYPE_IMAGE, "image/png", false);
+      1, 1, "http://www.nike.com", "http://nike.com/image2.png",
+      content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   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(std::string(),
-                                           "http://nike.com/style1.css",
-                                           content::RESOURCE_TYPE_STYLESHEET,
-                                           1,
-                                           0,
-                                           0,
-                                           1.0));
-  url_data.resources.push_back(ResourceRow(std::string(),
-                                           "http://nike.com/image2.png",
-                                           content::RESOURCE_TYPE_IMAGE,
-                                           1,
-                                           0,
-                                           0,
-                                           2.0));
+  url_data.resources.push_back(ResourceRow(
+      std::string(), "http://nike.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0, net::MEDIUM));
+  url_data.resources.push_back(
+      ResourceRow(std::string(), "http://nike.com/image2.png",
+                  content::RESOURCE_TYPE_IMAGE, 1, 0, 0, 2.0, net::MEDIUM));
   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 46 matching lines @@
   EXPECT_EQ(1U, predictor_->host_table_cache_->size());
 
   EXPECT_CALL(*mock_tables_.get(), 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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
-  URLRequestSummary summary2 =
-      CreateURLRequestSummary(1,
-                              2,
-                              "http://www.google.com",
-                              "http://www.google.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
-  URLRequestSummary summary3 =
-      CreateURLRequestSummary(2,
-                              1,
-                              "http://www.yahoo.com",
-                              "http://www.yahoo.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary summary1 = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
+  URLRequestSummary summary2 = CreateURLRequestSummary(
+      1, 2, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
+  URLRequestSummary summary3 = CreateURLRequestSummary(
+      2, 1, "http://www.yahoo.com", "http://www.yahoo.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
 
   predictor_->OnMainFrameRequest(summary1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRequest(summary2);
   EXPECT_EQ(2U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRequest(summary3);
   EXPECT_EQ(3U, 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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
-  URLRequestSummary summary5 =
-      CreateURLRequestSummary(1,
-                              2,
-                              "http://www.google.com",
-                              "http://www.google.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary summary4 = CreateURLRequestSummary(
+      1, 1, "http://www.nike.com", "http://www.nike.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
+  URLRequestSummary summary5 = CreateURLRequestSummary(
+      1, 2, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
 
   predictor_->OnMainFrameRequest(summary4);
   EXPECT_EQ(3U, 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(3U, predictor_->inflight_navigations_.size());
 
-  URLRequestSummary summary6 =
-      CreateURLRequestSummary(3,
-                              1,
-                              "http://www.shoes.com",
-                              "http://www.shoes.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary summary6 = CreateURLRequestSummary(
+      3, 1, "http://www.shoes.com", "http://www.shoes.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->OnMainFrameRequest(summary6);
   EXPECT_EQ(3U, 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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
-  URLRequestSummary summary2 =
-      CreateURLRequestSummary(1,
-                              2,
-                              "http://www.google.com",
-                              "http://www.google.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
-  URLRequestSummary summary3 =
-      CreateURLRequestSummary(2,
-                              1,
-                              "http://www.yahoo.com",
-                              "http://www.yahoo.com",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary summary1 = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
+  URLRequestSummary summary2 = CreateURLRequestSummary(
+      1, 2, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
+  URLRequestSummary summary3 = CreateURLRequestSummary(
+      2, 1, "http://www.yahoo.com", "http://www.yahoo.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
 
   predictor_->OnMainFrameRedirect(summary1);
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
 
   predictor_->OnMainFrameRequest(summary1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRequest(summary2);
   EXPECT_EQ(2U, predictor_->inflight_navigations_.size());
 
   predictor_->OnMainFrameRedirect(summary3);
   EXPECT_EQ(2U, predictor_->inflight_navigations_.size());
   predictor_->OnMainFrameRedirect(summary1);
   EXPECT_EQ(1U, 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",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame1 = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->OnMainFrameRequest(main_frame1);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   // Now add a few subresources.
   URLRequestSummary resource2 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script1.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", false);
+      1, 1, "http://www.google.com", "http://google.com/script1.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   URLRequestSummary resource3 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/script2.js",
-      content::RESOURCE_TYPE_SCRIPT, "text/javascript", false);
+      1, 1, "http://www.google.com", "http://google.com/script2.js",
+      content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->OnSubresourceResponse(resource1);
   predictor_->OnSubresourceResponse(resource2);
   predictor_->OnSubresourceResponse(resource3);
 
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
   EXPECT_EQ(3U,
       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)));
 }
 
 TEST_F(ResourcePrefetchPredictorTest, GetCorrectPLT) {
   // 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",
-                              content::RESOURCE_TYPE_MAIN_FRAME,
-                              std::string(),
-                              false);
+  URLRequestSummary main_frame = CreateURLRequestSummary(
+      1, 1, "http://www.google.com", "http://www.google.com",
+      content::RESOURCE_TYPE_MAIN_FRAME, net::MEDIUM, std::string(), false);
   predictor_->RecordURLRequest(main_frame);
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   // Reset the creation time in |main_frame.navigation_id|. The correct creation
   // time is stored in |inflight_navigations_| and should be used later.
   main_frame.navigation_id.creation_time = base::TimeTicks();
   EXPECT_TRUE(main_frame.navigation_id.creation_time.is_null());
 
   // Now add a subresource.
   URLRequestSummary resource1 = CreateURLRequestSummary(
-      1, 1, "http://www.google.com",  "http://google.com/style1.css",
-      content::RESOURCE_TYPE_STYLESHEET, "text/css", false);
+      1, 1, "http://www.google.com", "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", false);
   predictor_->RecordURLResponse(resource1);
 
   PrefetchData host_data(PREFETCH_KEY_TYPE_HOST, "www.google.com");
-  host_data.resources.push_back(ResourceRow(std::string(),
-                                            "http://google.com/style1.css",
-                                            content::RESOURCE_TYPE_STYLESHEET,
-                                            1,
-                                            0,
-                                            0,
-                                            1.0));
+  host_data.resources.push_back(ResourceRow(
+      std::string(), "http://google.com/style1.css",
+      content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0, net::MEDIUM));
   EXPECT_CALL(*mock_tables_.get(), UpdateData(empty_url_data_, host_data));
 
   // The page load time will be collected by RPP_HISTOGRAM_MEDIUM_TIMES, which
   // has a upper bound of 3 minutes.
   base::TimeDelta plt =
       predictor_->OnNavigationComplete(main_frame.navigation_id);
   EXPECT_LT(plt, base::TimeDelta::FromSeconds(180));
 
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
@@ skipping 13 matching lines @@
       content::RESOURCE_TYPE_PREFETCH, "bogus/mime-type"));
   EXPECT_FALSE(ResourcePrefetchPredictor::IsHandledResourceType(
       content::RESOURCE_TYPE_PREFETCH, ""));
   EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
       content::RESOURCE_TYPE_PREFETCH, "application/font-woff"));
   EXPECT_TRUE(ResourcePrefetchPredictor::IsHandledResourceType(
       content::RESOURCE_TYPE_PREFETCH, "font/woff2"));
 }
 
 }  // namespace predictors