predictors: Move more methods from ResourcePrefetchPredictor into LoadingDataCollector.

chrome/browser/predictors/loading_test_util.cc

Index: chrome/browser/predictors/loading_test_util.cc
diff --git a/chrome/browser/predictors/loading_test_util.cc b/chrome/browser/predictors/loading_test_util.cc
index b740a7efe32b48ad7227dd32e1968b1059d40f25..96660d205316798dd9c11476f66c1f0fd00b859e 100644
--- a/chrome/browser/predictors/loading_test_util.cc
+++ b/chrome/browser/predictors/loading_test_util.cc
@@ -6,6 +6,7 @@
 
 #include <cmath>
 #include <memory>
+#include <utility>
 
 #include "content/public/browser/resource_request_info.h"
 #include "net/http/http_response_headers.h"
@@ -28,8 +29,6 @@ bool AlmostEqual(const double x, const double y) {
 
 namespace predictors {
 
-using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
-using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
 using Prediction = ResourcePrefetchPredictor::Prediction;
 
 MockResourcePrefetchPredictor::MockResourcePrefetchPredictor(
@@ -39,6 +38,59 @@ MockResourcePrefetchPredictor::MockResourcePrefetchPredictor(
 
 MockResourcePrefetchPredictor::~MockResourcePrefetchPredictor() = default;
 
+MockResourcePrefetchPredictorTables::MockResourcePrefetchPredictorTables() =
+    default;
+
+void MockResourcePrefetchPredictorTables::ScheduleDBTask(
+    const tracked_objects::Location& from_here,
+    DBTask task) {
+  ExecuteDBTaskOnDBThread(std::move(task));
+}
+
+void MockResourcePrefetchPredictorTables::ExecuteDBTaskOnDBThread(DBTask task) {
+  std::move(task).Run(nullptr);
+}
+
+GlowplugKeyValueTable<PrefetchData>*
+MockResourcePrefetchPredictorTables::url_resource_table() {
+  return &url_resource_table_;
+}
+
+GlowplugKeyValueTable<RedirectData>*
+MockResourcePrefetchPredictorTables::url_redirect_table() {
+  return &url_redirect_table_;
+}
+
+GlowplugKeyValueTable<PrefetchData>*
+MockResourcePrefetchPredictorTables::host_resource_table() {
+  return &host_resource_table_;
+}
+
+GlowplugKeyValueTable<RedirectData>*
+MockResourcePrefetchPredictorTables::host_redirect_table() {
+  return &host_redirect_table_;
+}
+
+GlowplugKeyValueTable<precache::PrecacheManifest>*
+MockResourcePrefetchPredictorTables::manifest_table() {
+  return &manifest_table_;
+}
+
+GlowplugKeyValueTable<OriginData>*
+MockResourcePrefetchPredictorTables::origin_table() {
+  return &origin_table_;
+}
+
+MockResourcePrefetchPredictorTables::~MockResourcePrefetchPredictorTables() =
+    default;
+
+MockResourcePrefetchPredictorObserver::MockResourcePrefetchPredictorObserver(
+    ResourcePrefetchPredictor* predictor)
+    : TestObserver(predictor) {}
+
+MockResourcePrefetchPredictorObserver::
+    ~MockResourcePrefetchPredictorObserver() {}
+
 void InitializeResourceData(ResourceData* resource,
                             const std::string& resource_url,
                             content::ResourceType resource_type,
@@ -164,6 +216,8 @@ PageRequestSummary CreatePageRequestSummary(
   PageRequestSummary summary(main_frame_gurl);
   summary.initial_url = GURL(initial_url);
   summary.subresource_requests = subresource_requests;
+  for (auto& request_summary : subresource_requests)
+    summary.UpdateOrAddToOrigins(request_summary);
   return summary;
 }
 
@@ -196,6 +250,16 @@ URLRequestSummary CreateURLRequestSummary(SessionID::id_type tab_id,
   return summary;
 }
 
+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;
+}
+
 ResourcePrefetchPredictor::Prediction CreatePrediction(
     const std::string& main_frame_key,
     std::vector<GURL> subresource_urls) {