predictors: Refactor resource_prefetch_predictor triggering.

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>
 
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "base/time/time.h"
 #include "chrome/browser/history/history_service_factory.h"
+#include "chrome/browser/predictors/loading_predictor.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor_test_util.h"
+#include "chrome/browser/predictors/resource_prefetcher_manager.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/sessions/core/session_id.h"
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/http/http_response_headers.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
@@ skipping 189 matching lines @@
                                            TRAFFIC_ANNOTATION_FOR_TESTS);
     request->set_first_party_for_cookies(url);
     content::ResourceRequestInfo::AllocateForTesting(
         request.get(), resource_type, nullptr, -1, -1, -1, is_main_frame, false,
         false, true, content::PREVIEWS_OFF);
     request->Start();
     return request;
   }
 
   void InitializePredictor() {
-    predictor_->StartInitialization();
+    loading_predictor_->StartInitialization();
     base::RunLoop loop;
     loop.RunUntilIdle();  // Runs the DB lookup.
     profile_->BlockUntilHistoryProcessesPendingRequests();
   }
 
   void ResetPredictor() {
     LoadingPredictorConfig config;
-    config.max_urls_to_track = 3;
-    config.max_hosts_to_track = 2;
-    config.min_url_visit_count = 2;
-    config.max_resources_per_entry = 4;
-    config.max_consecutive_misses = 2;
-    config.max_redirect_consecutive_misses = 2;
-    config.min_resource_confidence_to_trigger_prefetch = 0.5;
-    config.is_url_learning_enabled = true;
-    config.is_manifests_enabled = true;
-    config.is_origin_learning_enabled = true;
+    PopulateTestConfig(&config);
 
-    config.mode |= LoadingPredictorConfig::LEARNING;
-    predictor_.reset(new ResourcePrefetchPredictor(config, profile_.get()));
+    loading_predictor_ =
+        base::MakeUnique<LoadingPredictor>(config, profile_.get());
+    predictor_ = loading_predictor_->resource_prefetch_predictor();
     predictor_->set_mock_tables(mock_tables_);
   }
 
   void InitializeSampleData();
   void TestRedirectStatusHistogram(
       const std::string& predictor_initial_key,
       const std::string& predictor_key,
       const std::string& navigation_initial_url,
       const std::string& navigation_url,
       ResourcePrefetchPredictor::RedirectStatus expected_status);
 
   content::TestBrowserThreadBundle thread_bundle_;
   std::unique_ptr<TestingProfile> profile_;
   net::TestURLRequestContext url_request_context_;
 
-  std::unique_ptr<ResourcePrefetchPredictor> predictor_;
+  std::unique_ptr<LoadingPredictor> loading_predictor_;
+  ResourcePrefetchPredictor* predictor_;
   scoped_refptr<StrictMock<MockResourcePrefetchPredictorTables>> mock_tables_;
 
   PrefetchDataMap test_url_data_;
   PrefetchDataMap test_host_data_;
   RedirectDataMap test_url_redirect_data_;
   RedirectDataMap test_host_redirect_data_;
   ManifestDataMap test_manifest_data_;
   OriginDataMap test_origin_data_;
 
   MockURLRequestJobFactory url_request_job_factory_;
@@ skipping 34 matching lines @@
   EXPECT_TRUE(predictor_->inflight_navigations_.empty());
   EXPECT_EQ(predictor_->initialization_state_,
             ResourcePrefetchPredictor::INITIALIZED);
 
   url_request_context_.set_job_factory(&url_request_job_factory_);
 
   histogram_tester_.reset(new base::HistogramTester());
 }
 
 void ResourcePrefetchPredictorTest::TearDown() {
-  predictor_.reset(NULL);
+  loading_predictor_ = nullptr;
   profile_->DestroyHistoryService();
 }
 
 void ResourcePrefetchPredictorTest::InitializeSampleData() {
   {  // Url data.
     PrefetchData google = CreatePrefetchData("http://www.google.com/", 1);
     InitializeResourceData(google.add_resources(),
                            "http://google.com/style1.css",
                            content::RESOURCE_TYPE_STYLESHEET, 3, 2, 1, 1.0,
                            net::MEDIUM, false, false);
@@ skipping 143 matching lines @@
     const std::string& navigation_initial_url,
     const std::string& navigation_url,
     ResourcePrefetchPredictor::RedirectStatus expected_status) {
   // Database initialization.
   const std::string& script_url = "https://cdn.google.com/script.js";
   PrefetchData google = CreatePrefetchData(predictor_key, 1);
   // We need at least one resource for prediction.
   InitializeResourceData(google.add_resources(), script_url,
                          content::RESOURCE_TYPE_SCRIPT, 10, 0, 1, 2.1,
                          net::MEDIUM, false, false);
-  predictor_->host_table_cache_->insert(
-      std::make_pair(google.primary_key(), google));
+  predictor_->host_table_cache_->emplace(google.primary_key(), google);
 
   if (predictor_initial_key != predictor_key) {
     RedirectData redirect = CreateRedirectData(predictor_initial_key, 1);
     InitializeRedirectStat(redirect.add_redirect_endpoints(), predictor_key, 10,
                            0, 0);
-    predictor_->host_redirect_table_cache_->insert(
-        std::make_pair(redirect.primary_key(), redirect));
+    predictor_->host_redirect_table_cache_->emplace(redirect.primary_key(),
+                                                    redirect);
   }
 
   // Navigation simulation.
   using testing::_;
   EXPECT_CALL(*mock_tables_.get(), UpdateResourceData(_, _));
   EXPECT_CALL(*mock_tables_.get(), UpdateRedirectData(_, _));
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(_));
   URLRequestSummary initial =
       CreateURLRequestSummary(1, navigation_initial_url);
   predictor_->RecordURLRequest(initial);
@@ skipping 96 matching lines @@
   predictor_->RecordURLResponse(resource1);
   URLRequestSummary resource2 = CreateURLRequestSummary(
       1, "https://www.google.com", "https://google.com/script1.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource2);
   URLRequestSummary resource3 = CreateURLRequestSummary(
       1, "https://www.google.com", "https://google.com/script2.js",
       content::RESOURCE_TYPE_SCRIPT, net::MEDIUM, "text/javascript", false);
   predictor_->RecordURLResponse(resource3);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount,
                           CreatePageRequestSummary(
                               "https://www.google.com", "http://www.google.com",
                               {resource1, resource2, resource3})));
 
   PrefetchData host_data = CreatePrefetchData("www.google.com");
   InitializeResourceData(host_data.add_resources(),
                          "https://google.com/style1.css",
@@ skipping 76 matching lines @@
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   redirected.redirect_url = GURL("http://dev.null.google.com/style.css");
 
   predictor_->RecordURLRedirect(redirected);
   redirected.is_no_store = true;
   redirected.request_url = redirected.redirect_url;
   redirected.redirect_url = GURL();
 
   predictor_->RecordURLResponse(redirected);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               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,
@@ skipping 98 matching lines @@
       1, "http://www.google.com", "http://google.com/style2.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true));
   predictor_->RecordURLResponse(resources.back());
   auto no_store = CreateURLRequestSummary(
       1, "http://www.google.com",
       "http://static.google.com/style2-no-store.css",
       content::RESOURCE_TYPE_STYLESHEET, net::MEDIUM, "text/css", true);
   no_store.is_no_store = true;
   predictor_->RecordURLResponse(no_store);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               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,
@@ skipping 84 matching lines @@
 
   URLRequestSummary resource1 = CreateURLRequestSummary(
       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, "http://www.nike.com", "http://nike.com/image2.png",
       content::RESOURCE_TYPE_IMAGE, net::MEDIUM, "image/png", false);
   predictor_->RecordURLResponse(resource2);
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(mock_observer,
               OnNavigationLearned(
                   kVisitCount, CreatePageRequestSummary(
                                    "http://www.nike.com", "http://www.nike.com",
                                    {resource1, resource2})));
 
   EXPECT_CALL(*mock_tables_.get(),
               DeleteSingleResourceDataPoint("http://www.google.com/",
                                             PREFETCH_KEY_TYPE_URL));
   EXPECT_CALL(*mock_tables_.get(),
@@ skipping 44 matching lines @@
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
       1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
       1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
   NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
   // Since the navigation hasn't resources, corresponding entry
   // in resource table will be deleted.
   EXPECT_CALL(*mock_tables_.get(),
@@ skipping 43 matching lines @@
   EXPECT_EQ(1U, predictor_->inflight_navigations_.size());
 
   URLRequestSummary fb2 = CreateRedirectRequestSummary(
       1, "http://fb.com/google", "http://facebook.com/google");
   predictor_->RecordURLRedirect(fb2);
   URLRequestSummary fb3 = CreateRedirectRequestSummary(
       1, "http://facebook.com/google", "https://facebook.com/google");
   predictor_->RecordURLRedirect(fb3);
   NavigationID fb_end = CreateNavigationID(1, "https://facebook.com/google");
 
-  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(
-      predictor_.get());
+  StrictMock<MockResourcePrefetchPredictorObserver> mock_observer(predictor_);
   EXPECT_CALL(
       mock_observer,
       OnNavigationLearned(kVisitCount, CreatePageRequestSummary(
                                            "https://facebook.com/google",
                                            "http://fb.com/google",
                                            std::vector<URLRequestSummary>())));
 
   // Oldest entries in tables will be superseded and deleted.
   EXPECT_CALL(*mock_tables_.get(),
               DeleteSingleRedirectDataPoint("bbc.com", PREFETCH_KEY_TYPE_HOST));
@@ skipping 1014 matching lines @@
 }
 
 TEST_F(ResourcePrefetchPredictorTest,
        TestRedirectStatusRedirectCorrectlyPredicted) {
   TestRedirectStatusHistogram(
       "google.com", "www.google.com", "http://google.com?query=cats",
       "http://www.google.com?query=cats",
       ResourcePrefetchPredictor::RedirectStatus::REDIRECT_CORRECTLY_PREDICTED);
 }
 
-TEST_F(ResourcePrefetchPredictorTest, TestPrefetchingDurationHistogram) {
-  // Prefetching duration for an url without resources in the database
-  // shouldn't be recorded.
-  const std::string main_frame_url = "http://google.com/?query=cats";
-  predictor_->StartPrefetching(GURL(main_frame_url), HintOrigin::EXTERNAL);
-  predictor_->StopPrefetching(GURL(main_frame_url));
-  histogram_tester_->ExpectTotalCount(
-      internal::kResourcePrefetchPredictorPrefetchingDurationHistogram, 0);
-
-  // Fill the database to record a duration.
-  PrefetchData google = CreatePrefetchData("google.com", 1);
-  InitializeResourceData(
-      google.add_resources(), "https://cdn.google.com/script.js",
-      content::RESOURCE_TYPE_SCRIPT, 10, 0, 1, 2.1, net::MEDIUM, false, false);
-  predictor_->host_table_cache_->insert(
-      std::make_pair(google.primary_key(), google));
-
-  predictor_->StartPrefetching(GURL(main_frame_url), HintOrigin::EXTERNAL);
-  predictor_->StopPrefetching(GURL(main_frame_url));
-  histogram_tester_->ExpectTotalCount(
-      internal::kResourcePrefetchPredictorPrefetchingDurationHistogram, 1);
-}
-
 TEST_F(ResourcePrefetchPredictorTest, TestRecordFirstContentfulPaint) {
   using testing::_;
   EXPECT_CALL(*mock_tables_.get(), UpdateRedirectData(_, _));
   EXPECT_CALL(*mock_tables_.get(), UpdateOriginData(_));
 
   auto res1_time = base::TimeTicks::FromInternalValue(1);
   auto res2_time = base::TimeTicks::FromInternalValue(2);
   auto fcp_time = base::TimeTicks::FromInternalValue(3);
   auto res3_time = base::TimeTicks::FromInternalValue(4);
 
@@ skipping 34 matching lines @@
                          net::MEDIUM, false, false);
   resource3_rd->set_before_first_contentful_paint(false);
   EXPECT_CALL(*mock_tables_.get(),
               UpdateResourceData(host_data, PREFETCH_KEY_TYPE_HOST));
 
   predictor_->RecordMainFrameLoadComplete(main_frame.navigation_id);
   profile_->BlockUntilHistoryProcessesPendingRequests();
 }
 
 }  // namespace predictors