predictors: Add resource type to manifest.

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 <utility>
 
@@ skipping 414 matching lines @@
                            "www.microsoft.com", 10, 0, 0);
 
     test_host_redirect_data_.clear();
     test_host_redirect_data_.insert(std::make_pair(bbc.primary_key(), bbc));
     test_host_redirect_data_.insert(
         std::make_pair(microsoft.primary_key(), microsoft));
   }
 
   {  // Manifest data.
     precache::PrecacheManifest google = CreateManifestData(11);
-    InitializePrecacheResource(google.add_resource(),
-                               "http://google.com/script.js", 0.5);
-    InitializePrecacheResource(google.add_resource(),
-                               "http://static.google.com/style.css", 0.333);
+    InitializePrecacheResource(
+        google.add_resource(), "http://google.com/script.js", 0.5,
+        precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+    InitializePrecacheResource(
+        google.add_resource(), "http://static.google.com/style.css", 0.333,
+        precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
 
     precache::PrecacheManifest facebook = CreateManifestData(12);
-    InitializePrecacheResource(facebook.add_resource(),
-                               "http://fb.com/static.css", 0.99);
+    InitializePrecacheResource(
+        facebook.add_resource(), "http://fb.com/static.css", 0.99,
+        precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
 
     test_manifest_data_.insert(std::make_pair("google.com", google));
     test_manifest_data_.insert(std::make_pair("facebook.com", facebook));
   }
 
   {  // Origin data.
     OriginData google = CreateOriginData("google.com", 12);
     InitializeOriginStat(google.add_origins(), "https://static.google.com", 12,
                          0, 0, 3., false, true);
     InitializeOriginStat(google.add_origins(), "https://cats.google.com", 12, 0,
@@ skipping 251 matching lines @@
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
 
   PrefetchData url_data = CreatePrefetchData("http://www.google.com/");
   InitializeResourceData(url_data.add_resources(),
                          "http://google.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0,
                          net::MEDIUM, false, false);
+  InitializeResourceData(url_data.add_resources(),
+                         "http://google.com/style2.css",
+                         content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0,
+                         net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
-  InitializeResourceData(url_data.add_resources(),
-                         "http://google.com/style2.css",
-                         content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0,
-                         net::MEDIUM, false, false);
   EXPECT_CALL(*mock_tables_.get(),
               UpdateResourceData(url_data, PREFETCH_KEY_TYPE_URL));
 
   OriginData origin_data = CreateOriginData("www.google.com");
   InitializeOriginStat(origin_data.add_origins(), "http://static.google.com/",
                        1, 0, 0, 2., true, true);
   InitializeOriginStat(origin_data.add_origins(), "http://dev.null.google.com/",
                        1, 0, 0, 4., true, true);
   InitializeOriginStat(origin_data.add_origins(), "http://google.com/", 1, 0, 0,
                        1., false, true);
@@ skipping 90 matching lines @@
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary("http://www.google.com",
                                                         "http://www.google.com",
                                                         resources)));
 
   PrefetchData url_data = CreatePrefetchData("http://www.google.com/");
   InitializeResourceData(url_data.add_resources(),
                          "http://google.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 4, 2, 0, 1.0,
                          net::MEDIUM, false, false);
+  InitializeResourceData(url_data.add_resources(),
+                         "http://google.com/style2.css",
+                         content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0,
+                         net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       url_data.add_resources(), "http://google.com/script4.js",
       content::RESOURCE_TYPE_SCRIPT, 11, 1, 1, 2.1, net::MEDIUM, false, false);
-  InitializeResourceData(
-      url_data.add_resources(), "http://google.com/script2.js",
-      content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
   EXPECT_CALL(*mock_tables_.get(),
               UpdateResourceData(url_data, PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_.get(),
               DeleteSingleResourceDataPoint("www.facebook.com",
                                             PREFETCH_KEY_TYPE_HOST));
 
   PrefetchData host_data = CreatePrefetchData("www.google.com");
   InitializeResourceData(host_data.add_resources(),
                          "http://google.com/style1.css",
                          content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 1.0,
                          net::MEDIUM, false, false);
+  InitializeResourceData(host_data.add_resources(),
+                         "http://google.com/style2.css",
+                         content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0,
+                         net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "http://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false, false);
   InitializeResourceData(
       host_data.add_resources(), "http://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0, net::MEDIUM, false, false);
-  InitializeResourceData(host_data.add_resources(),
-                         "http://google.com/style2.css",
-                         content::RESOURCE_TYPE_STYLESHEET, 1, 0, 0, 7.0,
-                         net::MEDIUM, false, false);
   EXPECT_CALL(*mock_tables_.get(),
               UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
 
   RedirectData url_redirect_data = CreateRedirectData("http://www.google.com/");
   InitializeRedirectStat(url_redirect_data.add_redirect_endpoints(),
                          "http://www.google.com/", 1, 0, 0);
   EXPECT_CALL(*mock_tables_.get(),
               UpdateRedirectData(url_redirect_data, PREFETCH_KEY_TYPE_URL));
 
   RedirectData host_redirect_data = CreateRedirectData("www.google.com");
@@ skipping 216 matching lines @@
               UpdateRedirectData(host_redirect_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(fb_end);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestHostNotInDB) {
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
   InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/script.js", 0.9);
-  InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/style.css", 0.75);
+                             "http://cdn.google.com/script.js", 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+  InitializePrecacheResource(
+      manifest.add_resource(), "http://cdn.google.com/style.css", 0.75,
+      precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
 
   EXPECT_CALL(*mock_tables_.get(), UpdateManifestData("google.com", manifest));
 
   predictor_->OnManifestFetched("google.com", manifest);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestHostInDB) {
   EXPECT_CALL(*mock_tables_.get(),
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(ManifestDataMap())),
                          Pointee(ContainerEq(OriginDataMap()))))
       .WillOnce(SetArgPointee<4>(test_manifest_data_));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(2U, predictor_->manifest_table_cache_->size());
 
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
   InitializePrecacheResource(manifest.add_resource(),
-                             "http://google.com/image.jpg", 0.1);
+                             "http://google.com/image.jpg", 0.1,
+                             precache::PrecacheResource::RESOURCE_TYPE_IMAGE);
 
   EXPECT_CALL(*mock_tables_.get(), UpdateManifestData("google.com", manifest));
 
   predictor_->OnManifestFetched("google.com", manifest);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestHostNotInDBAndDBFull) {
   EXPECT_CALL(*mock_tables_.get(),
               GetAllData(Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(PrefetchDataMap())),
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(RedirectDataMap())),
                          Pointee(ContainerEq(ManifestDataMap())),
                          Pointee(ContainerEq(OriginDataMap()))))
       .WillOnce(SetArgPointee<4>(test_manifest_data_));
   ResetPredictor();
   InitializePredictor();
   EXPECT_EQ(2U, predictor_->manifest_table_cache_->size());
 
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
   InitializePrecacheResource(manifest.add_resource(),
-                             "http://en.wikipedia.org/logo.png", 1.0);
+                             "http://en.wikipedia.org/logo.png", 1.0,
+                             precache::PrecacheResource::RESOURCE_TYPE_IMAGE);
 
   EXPECT_CALL(*mock_tables_.get(),
               DeleteManifestData(std::vector<std::string>({"google.com"})));
 
   EXPECT_CALL(*mock_tables_.get(),
               UpdateManifestData("en.wikipedia.org", manifest));
 
   predictor_->OnManifestFetched("en.wikipedia.org", manifest);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestUnknownFieldsRemoved) {
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
   InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/script.js", 0.9);
-  InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/style.css", 0.75);
+                             "http://cdn.google.com/script.js", 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+  InitializePrecacheResource(
+      manifest.add_resource(), "http://cdn.google.com/style.css", 0.75,
+      precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
 
   precache::PrecacheManifest manifest_with_unknown_fields(manifest);
   manifest_with_unknown_fields.mutable_id()->mutable_unknown_fields()->append(
       "DATA");
   manifest_with_unknown_fields.mutable_unknown_fields()->append("DATA");
   for (auto& resource : *manifest_with_unknown_fields.mutable_resource()) {
     resource.mutable_unknown_fields()->append("DATA");
   }
 
   int manifest_size = manifest.ByteSize();
   auto match_size = [manifest_size](const precache::PrecacheManifest& m) {
     return m.ByteSize() == manifest_size;
   };
   EXPECT_CALL(
       *mock_tables_.get(),
       UpdateManifestData("google.com",
                          testing::AllOf(manifest, testing::Truly(match_size))));
 
   predictor_->OnManifestFetched("google.com", manifest_with_unknown_fields);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestTooOld) {
   base::Time old_time = base::Time::Now() - base::TimeDelta::FromDays(7);
   precache::PrecacheManifest manifest =
       CreateManifestData(old_time.ToDoubleT());
   InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/script.js", 0.9);
-  InitializePrecacheResource(manifest.add_resource(),
-                             "http://cdn.google.com/style.css", 0.75);
+                             "http://cdn.google.com/script.js", 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+  InitializePrecacheResource(
+      manifest.add_resource(), "http://cdn.google.com/style.css", 0.75,
+      precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
 
   // No calls to DB should happen.
   predictor_->OnManifestFetched("google.com", manifest);
 }
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestUnusedRemoved) {
   const std::string& script_url = "http://cdn.google.com/script.js";
   const std::string& style_url = "http://cdn.google.com/style.css";
   PrefetchData google = CreatePrefetchData("www.google.com");
   InitializeResourceData(google.add_resources(), script_url,
                          content::RESOURCE_TYPE_SCRIPT, 10, 0, 1, 2.1,
                          net::MEDIUM, false, false);
   InitializeResourceData(google.add_resources(), style_url,
                          content::RESOURCE_TYPE_SCRIPT, 10, 0, 1, 2.1,
                          net::MEDIUM, false, false);
   predictor_->host_table_cache_->insert({google.primary_key(), google});
 
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
-  InitializePrecacheResource(manifest.add_resource(), script_url, 0.9);
-  InitializePrecacheResource(manifest.add_resource(), style_url, 0.75);
+  InitializePrecacheResource(manifest.add_resource(), script_url, 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+  InitializePrecacheResource(
+      manifest.add_resource(), style_url, 0.75,
+      precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
   InitializeExperiment(&manifest, internal::kUnusedRemovedExperiment,
                        {true, false});
 
   // style_url should be removed.
   google.mutable_resources()->RemoveLast();
   EXPECT_CALL(*mock_tables_.get(),
               UpdateResourceData(google, PREFETCH_KEY_TYPE_HOST));
   EXPECT_CALL(*mock_tables_.get(), UpdateManifestData("google.com", manifest));
 
   predictor_->OnManifestFetched("google.com", manifest);
@@ skipping 563 matching lines @@
   EXPECT_FALSE(predictor_->PopulatePrefetcherRequest("http://404.com",
                                                      test_data, &urls));
   EXPECT_TRUE(urls.empty());
 }
 
 TEST_F(ResourcePrefetchPredictorTest, PopulateFromManifest) {
   // The data that will be used in populating.
   precache::PrecacheManifest google =
       CreateManifestData(base::Time::Now().ToDoubleT());
   InitializePrecacheResource(google.add_resource(),
-                             "https://static.google.com/good", 0.9);
+                             "https://static.google.com/good.js", 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
   InitializePrecacheResource(google.add_resource(),
-                             "https://static.google.com/low_confidence", 0.6);
+                             "https://static.google.com/versioned_removed", 0.8,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
   InitializePrecacheResource(google.add_resource(),
-                             "https://static.google.com/versionned_removed",
-                             0.8);
+                             "https://static.google.com/unused_removed", 0.8,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
   InitializePrecacheResource(google.add_resource(),
-                             "https://static.google.com/unused_removed", 0.8);
+                             "https://static.google.com/no_store", 0.8,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
+  InitializePrecacheResource(
+      google.add_resource(), "https://static.google.com/good.css", 0.75,
+      precache::PrecacheResource::RESOURCE_TYPE_STYLESHEET);
   InitializePrecacheResource(google.add_resource(),
-                             "https://static.google.com/no_store", 0.8);
+                             "https://static.google.com/low_confidence", 0.6,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
   InitializeExperiment(&google, internal::kVersionedRemovedExperiment,
+                       {true, false, true, true, true});
+  InitializeExperiment(&google, internal::kUnusedRemovedExperiment,
                        {true, true, false, true, true});
-  InitializeExperiment(&google, internal::kUnusedRemovedExperiment,
+  InitializeExperiment(&google, internal::kNoStoreRemovedExperiment,
                        {true, true, true, false, true});
-  InitializeExperiment(&google, internal::kNoStoreRemovedExperiment,
-                       {true, true, true, true, false});
 
   // The data that's too old.
   base::Time old_time = base::Time::Now() - base::TimeDelta::FromDays(7);
   precache::PrecacheManifest facebook =
       CreateManifestData(old_time.ToDoubleT());
   InitializePrecacheResource(facebook.add_resource(),
-                             "https://static.facebook.com/good", 0.9);
+                             "https://static.facebook.com/good", 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
 
   predictor_->manifest_table_cache_->insert({"google.com", google});
   predictor_->manifest_table_cache_->insert({"facebook.com", facebook});
 
   std::vector<GURL> urls;
   EXPECT_TRUE(predictor_->PopulateFromManifest("google.com", &urls));
-  EXPECT_THAT(urls,
-              UnorderedElementsAre(GURL("https://static.google.com/good")));
+  EXPECT_EQ(urls,
+            std::vector<GURL>({GURL("https://static.google.com/good.css"),
+                               GURL("https://static.google.com/good.js")}));
 
   urls.clear();
   EXPECT_FALSE(predictor_->PopulateFromManifest("facebook.com", &urls));
   EXPECT_TRUE(urls.empty());
 
   urls.clear();
   EXPECT_FALSE(predictor_->PopulateFromManifest("404.com", &urls));
   EXPECT_TRUE(urls.empty());
 }
 
@@ skipping 48 matching lines @@
   const GURL main_frame_url("http://google.com/?query=cats");
   ResourcePrefetchPredictor::Prediction prediction;
   std::vector<GURL>& urls = prediction.subresource_urls;
   // No prefetch data.
   EXPECT_FALSE(predictor_->GetPrefetchData(main_frame_url, &prediction));
 
   // Add a manifest associated with the main frame host.
   const std::string& resource_url = "https://static.google.com/resource";
   precache::PrecacheManifest manifest =
       CreateManifestData(base::Time::Now().ToDoubleT());
-  InitializePrecacheResource(manifest.add_resource(), resource_url, 0.9);
+  InitializePrecacheResource(manifest.add_resource(), resource_url, 0.9,
+                             precache::PrecacheResource::RESOURCE_TYPE_SCRIPT);
   predictor_->manifest_table_cache_->insert({"google.com", manifest});
 
   urls.clear();
   EXPECT_TRUE(predictor_->GetPrefetchData(main_frame_url, &prediction));
   EXPECT_THAT(urls, UnorderedElementsAre(GURL(resource_url)));
 
   // Add a resource associated with the main frame host.
   PrefetchData google_host = CreatePrefetchData("google.com", 2);
   const std::string script_url = "https://cdn.google.com/script.js";
   InitializeResourceData(google_host.add_resources(), script_url,
@@ skipping 177 matching lines @@
   predictor_->host_table_cache_->insert(
       std::make_pair(google.primary_key(), google));
 
   predictor_->StartPrefetching(GURL(main_frame_url), PrefetchOrigin::EXTERNAL);
   predictor_->StopPrefetching(GURL(main_frame_url));
   histogram_tester_->ExpectTotalCount(
       internal::kResourcePrefetchPredictorPrefetchingDurationHistogram, 1);
 }
 
 }  // namespace predictors