predictors: Add resource type to manifest.

chrome/browser/predictors/resource_prefetch_predictor_tables_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
@@ skipping 298 matching lines @@
   RedirectData microsoft = CreateRedirectData("microsoft.com", 21);
   InitializeRedirectStat(microsoft.add_redirect_endpoints(), "m.microsoft.com",
                          5, 7, 1);
   InitializeRedirectStat(microsoft.add_redirect_endpoints(), "microsoft.org", 7,
                          2, 0);
 
   tables_->UpdateRedirectData(microsoft, PREFETCH_KEY_TYPE_HOST);
 
   precache::PrecacheManifest theverge;
   InitializePrecacheResource(theverge.add_resource(),
-                             "https://www.theverge.com/main.js", 0.7);
+                             "https://www.theverge.com/main.js", 0.7,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
 
   tables_->UpdateManifestData("theverge.com", theverge);
 
   OriginData twitter = CreateOriginData("twitter.com");
   InitializeOriginStat(twitter.add_origins(), "https://dogs.twitter.com", 10, 1,
                        0, 12., false, true);
   tables_->UpdateOriginData(twitter);
 
   PrefetchDataMap actual_url_data, actual_host_data;
   RedirectDataMap actual_url_redirect_data, actual_host_redirect_data;
@@ skipping 388 matching lines @@
     test_host_redirect_data_.insert(std::make_pair(bbc.primary_key(), bbc));
     test_host_redirect_data_.insert(
         std::make_pair(microsoft.primary_key(), microsoft));
 
     tables_->UpdateRedirectData(bbc, PREFETCH_KEY_TYPE_HOST);
     tables_->UpdateRedirectData(microsoft, PREFETCH_KEY_TYPE_HOST);
   }
 
   {  // Manifest data.
     precache::PrecacheManifest wikipedia;
+    InitializePrecacheResource(
+        wikipedia.add_resource(), "https://en.wikipedia.org/script.js", 0.7,
+        precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
     InitializePrecacheResource(wikipedia.add_resource(),
-                               "https://en.wikipedia.org/script.js", 0.7);
-    InitializePrecacheResource(wikipedia.add_resource(),
-                               "https://en.wikipedia.org/image.png", 0.3);
+                               "https://en.wikipedia.org/image.png", 0.3,
+                               precache::PrecacheResource::RESOURCE_TYPE_IMAGE);
 
     precache::PrecacheManifest youtube;
     InitializePrecacheResource(youtube.add_resource(),
-                               "https://youtube.com/photo.jpg", 0.5);
-    InitializePrecacheResource(youtube.add_resource(),
-                               "https://youtube.com/base.js", 0.2);
+                               "https://youtube.com/photo.jpg", 0.5,
+                               precache::PrecacheResource::RESOURCE_TYPE_IMAGE);
+    InitializePrecacheResource(
+        youtube.add_resource(), "https://youtube.com/base.js", 0.2,
+        precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
 
     test_manifest_data_.clear();
     test_manifest_data_.insert(std::make_pair("en.wikipedia.org", wikipedia));
     test_manifest_data_.insert(std::make_pair("youtube.com", youtube));
     tables_->UpdateManifestData("en.wikipedia.org", wikipedia);
     tables_->UpdateManifestData("youtube.com", youtube);
   }
 
   {  // Origin data.
     OriginData twitter;
@@ skipping 42 matching lines @@
 
   EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_IMAGE, 42.),
             compute_score(net::MEDIUM, content::RESOURCE_TYPE_SCRIPT, 1.));
   EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_IMAGE, 42.),
             compute_score(net::LOW, content::RESOURCE_TYPE_SCRIPT, 1.));
   EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_IMAGE, 42.),
             compute_score(net::LOWEST, content::RESOURCE_TYPE_SCRIPT, 1.));
   EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_IMAGE, 42.),
             compute_score(net::IDLE, content::RESOURCE_TYPE_SCRIPT, 1.));
 
-  // Scripts and stylesheets are equivalent.
-  EXPECT_NEAR(
-      compute_score(net::HIGHEST, content::RESOURCE_TYPE_SCRIPT, 42.),
-      compute_score(net::HIGHEST, content::RESOURCE_TYPE_STYLESHEET, 42.),
-      1e-4);
-
-  // Scripts are more important than fonts and images, and the rest.
+  // Stylesheets are are more important than scripts, fonts and images, and the
+  // rest.
+  EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_STYLESHEET, 42.),
+            compute_score(net::HIGHEST, content::RESOURCE_TYPE_SCRIPT, 42.));
   EXPECT_GT(
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_SCRIPT, 42.),
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_FONT_RESOURCE, 42.));
   EXPECT_GT(
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_FONT_RESOURCE, 42.),
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_IMAGE, 42.));
   EXPECT_GT(
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_FONT_RESOURCE, 42.),
       compute_score(net::HIGHEST, content::RESOURCE_TYPE_FAVICON, 42.));
 
   // All else being equal, position matters.
   EXPECT_GT(compute_score(net::HIGHEST, content::RESOURCE_TYPE_SCRIPT, 12.),
             compute_score(net::HIGHEST, content::RESOURCE_TYPE_SCRIPT, 42.));
 }
 
+TEST_F(ResourcePrefetchPredictorTablesTest, ComputePrecacheResourceScore) {
+  auto compute_score = [](precache::PrecacheResource::Type resource_type,
+                          float weight_ratio) {
+    precache::PrecacheResource resource;
+    InitializePrecacheResource(&resource, "", weight_ratio, resource_type);
+    return ResourcePrefetchPredictorTables::ComputePrecacheResourceScore(
+        resource);
+  };
+
+  // Stylesheets are the most impotant followed by scripts, fonts and images in
+  // this order.
+  EXPECT_GT(
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET, 0.1),
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_SCRIPT, 0.9));
+  EXPECT_GT(
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_SCRIPT, 0.1),
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_FONT, 0.9));
+  EXPECT_GT(
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_FONT, 0.1),
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_IMAGE, 0.9));
+
+  // If resource types are equal, weight ratio matters.
+  EXPECT_GT(
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_SCRIPT, 0.7),
+      compute_score(precache::PrecacheResource::RESOURCE_TYPE_SCRIPT, 0.6));
+}
+
 TEST_F(ResourcePrefetchPredictorTablesTest, ComputeOriginScore) {
   auto compute_score = [](int hits, int misses, double average_position,
                           bool always_access_network, bool accessed_network) {
     OriginStat origin;
     InitializeOriginStat(&origin, "", hits, misses, 0, average_position,
                          always_access_network, accessed_network);
     return ResourcePrefetchPredictorTables::ComputeOriginScore(origin);
   };
 
   // High-confidence is more important than the rest.
@@ skipping 94 matching lines @@
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteSingleDataPoint) {
   TestDeleteSingleDataPoint();
 }
 
 TEST_F(ResourcePrefetchPredictorTablesReopenTest, DeleteAllData) {
   TestDeleteAllData();
 }
 
 }  // namespace predictors