predictors: Move more methods from ResourcePrefetchPredictor into LoadingDataCollector.

chrome/browser/predictors/resource_prefetch_predictor_unittest.cc

Index: chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
index 0ec87e206c933e5e0f4cc0c0d23c6bd8b5ea6d94..6a79d2556a65f4add5565e277fb4aaddabe37ba3 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_unittest.cc
@@ -35,97 +35,11 @@ using testing::UnorderedElementsAre;
 
 namespace predictors {
 
-using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
-using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
 using PrefetchDataMap = std::map<std::string, PrefetchData>;
 using RedirectDataMap = std::map<std::string, RedirectData>;
 using OriginDataMap = std::map<std::string, OriginData>;
 using ManifestDataMap = std::map<std::string, precache::PrecacheManifest>;
 
-template <typename T>
-class FakeGlowplugKeyValueTable : public GlowplugKeyValueTable<T> {
- public:
-  FakeGlowplugKeyValueTable() : GlowplugKeyValueTable<T>("") {}
-  void GetAllData(std::map<std::string, T>* data_map,
-                  sql::Connection* db) const override {
-    *data_map = data_;
-  }
-  void UpdateData(const std::string& key,
-                  const T& data,
-                  sql::Connection* db) override {
-    data_[key] = data;
-  }
-  void DeleteData(const std::vector<std::string>& keys,
-                  sql::Connection* db) override {
-    for (const auto& key : keys)
-      data_.erase(key);
-  }
-  void DeleteAllData(sql::Connection* db) override { data_.clear(); }
-
-  std::map<std::string, T> data_;
-};
-
-class MockResourcePrefetchPredictorTables
-    : public ResourcePrefetchPredictorTables {
- public:
-  MockResourcePrefetchPredictorTables() = default;
-
-  void ScheduleDBTask(const tracked_objects::Location& from_here,
-                      DBTask task) override {
-    ExecuteDBTaskOnDBThread(std::move(task));
-  }
-
-  void ExecuteDBTaskOnDBThread(DBTask task) override {
-    std::move(task).Run(nullptr);
-  }
-
-  GlowplugKeyValueTable<PrefetchData>* url_resource_table() override {
-    return &url_resource_table_;
-  }
-
-  GlowplugKeyValueTable<RedirectData>* url_redirect_table() override {
-    return &url_redirect_table_;
-  }
-
-  GlowplugKeyValueTable<PrefetchData>* host_resource_table() override {
-    return &host_resource_table_;
-  }
-
-  GlowplugKeyValueTable<RedirectData>* host_redirect_table() override {
-    return &host_redirect_table_;
-  }
-
-  GlowplugKeyValueTable<precache::PrecacheManifest>* manifest_table() override {
-    return &manifest_table_;
-  }
-
-  GlowplugKeyValueTable<OriginData>* origin_table() override {
-    return &origin_table_;
-  }
-
-  FakeGlowplugKeyValueTable<PrefetchData> url_resource_table_;
-  FakeGlowplugKeyValueTable<RedirectData> url_redirect_table_;
-  FakeGlowplugKeyValueTable<PrefetchData> host_resource_table_;
-  FakeGlowplugKeyValueTable<RedirectData> host_redirect_table_;
-  FakeGlowplugKeyValueTable<precache::PrecacheManifest> manifest_table_;
-  FakeGlowplugKeyValueTable<OriginData> origin_table_;
-
- protected:
-  ~MockResourcePrefetchPredictorTables() override = default;
-};
-
-class MockResourcePrefetchPredictorObserver : public TestObserver {
- public:
-  explicit MockResourcePrefetchPredictorObserver(
-      ResourcePrefetchPredictor* predictor)
-      : TestObserver(predictor) {}
-
-  MOCK_METHOD2(
-      OnNavigationLearned,
-      void(size_t url_visit_count,
-           const ResourcePrefetchPredictor::PageRequestSummary& summary));
-};
-
 class ResourcePrefetchPredictorTest : public testing::Test {
  public:
   ResourcePrefetchPredictorTest();
@@ -134,30 +48,6 @@ class ResourcePrefetchPredictorTest : public testing::Test {
   void TearDown() override;
 
  protected:
-  void AddUrlToHistory(const std::string& url, int visit_count) {
-    HistoryServiceFactory::GetForProfile(profile_.get(),
-                                         ServiceAccessType::EXPLICIT_ACCESS)->
-        AddPageWithDetails(
-            GURL(url),
-            base::string16(),
-            visit_count,
-            0,
-            base::Time::Now(),
-            false,
-            history::SOURCE_BROWSED);
-    profile_->BlockUntilHistoryProcessesPendingRequests();
-  }
-
-  URLRequestSummary CreateRedirectRequestSummary(
-      SessionID::id_type session_id,
-      const std::string& main_frame_url,
-      const std::string& redirect_url) {
-    URLRequestSummary summary =
-        CreateURLRequestSummary(session_id, main_frame_url);
-    summary.redirect_url = GURL(redirect_url);
-    return summary;
-  }
-
   void InitializePredictor() {
     loading_predictor_->StartInitialization();
     base::RunLoop loop;
@@ -432,6 +322,7 @@ TEST_F(ResourcePrefetchPredictorTest, LazilyInitializeWithData) {
   // Integrity of the cache and the backend storage is checked on TearDown.
 }
 
+/*
 // Single navigation but history count is low, so should not record url data.
 TEST_F(ResourcePrefetchPredictorTest, NavigationLowHistoryCount) {
   const int kVisitCount = 1;
@@ -929,6 +820,7 @@ TEST_F(ResourcePrefetchPredictorTest, RedirectUrlInDB) {
   EXPECT_EQ(mock_tables_->host_redirect_table_.data_,
             expected_host_redirect_data);
 }
+*/
 
 TEST_F(ResourcePrefetchPredictorTest, ManifestHostNotInDB) {
   precache::PrecacheManifest manifest =
@@ -1151,6 +1043,7 @@ TEST_F(ResourcePrefetchPredictorTest, DeleteUrls) {
   EXPECT_TRUE(mock_tables_->manifest_table_.data_.empty());
 }
 
+/*
 TEST_F(ResourcePrefetchPredictorTest, OnMainFrameRequest) {
   URLRequestSummary summary1 = CreateURLRequestSummary(
       1, "http://www.google.com", "http://www.google.com",
@@ -1313,6 +1206,7 @@ TEST_F(ResourcePrefetchPredictorTest, OnSubresourceResponse) {
             predictor_->inflight_navigations_[main_frame1.navigation_id]
                 ->subresource_requests[2]);
 }
+*/
 
 TEST_F(ResourcePrefetchPredictorTest, SummarizeResponse) {
   net::HttpResponseInfo response_info;
@@ -1630,6 +1524,7 @@ TEST_F(ResourcePrefetchPredictorTest, GetPrefetchData) {
   EXPECT_THAT(urls, UnorderedElementsAre(GURL(font_url)));
 }
 
+/*
 TEST_F(ResourcePrefetchPredictorTest, TestRecordFirstContentfulPaint) {
   auto res1_time = base::TimeTicks::FromInternalValue(1);
   auto res2_time = base::TimeTicks::FromInternalValue(2);
@@ -1669,7 +1564,8 @@ TEST_F(ResourcePrefetchPredictorTest, TestRecordFirstContentfulPaint) {
                          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);
+      content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 2.0, net::MEDIUM, false,
+      false);
   ResourceData* resource3_rd = host_data.add_resources();
   InitializeResourceData(resource3_rd, "http://google.com/script2.js",
                          content::RESOURCE_TYPE_SCRIPT, 1, 0, 0, 3.0,
@@ -1678,5 +1574,6 @@ TEST_F(ResourcePrefetchPredictorTest, TestRecordFirstContentfulPaint) {
   EXPECT_EQ(mock_tables_->host_resource_table_.data_,
             PrefetchDataMap({{host_data.primary_key(), host_data}}));
 }
+*/
 
 }  // namespace predictors