predictors: Move more methods from ResourcePrefetchPredictor into LoadingDataCollector.

chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc

Index: chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc
diff --git a/chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc b/chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc
index 2e0e381352dfd5434e028af7ebfe73fcd8aee0aa..391569599342e721f5ebc68f754d48ea34f4e36a 100644
--- a/chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc
+++ b/chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc
@@ -89,7 +89,7 @@ struct ResourceSummary {
     request.before_first_contentful_paint = true;
   }
 
-  ResourcePrefetchPredictor::URLRequestSummary request;
+  URLRequestSummary request;
   // Allows to update HTTP ETag.
   size_t version;
   // True iff "Cache-control: no-store" header is present.
@@ -151,9 +151,6 @@ class BrowsingDataRemoverObserver
   DISALLOW_COPY_AND_ASSIGN(BrowsingDataRemoverObserver);
 };
 
-using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
-using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
-
 void RemoveDuplicateSubresources(std::vector<URLRequestSummary>* subresources) {
   std::stable_sort(subresources->begin(), subresources->end(),
                    [](const URLRequestSummary& x, const URLRequestSummary& y) {
@@ -240,8 +237,6 @@ GURL GetRequestURL(const net::test_server::HttpRequest& request) {
 // ResourcePrefetchPredictor works as expected.
 class LearningObserver : public TestObserver {
  public:
-  using PageRequestSummary = ResourcePrefetchPredictor::PageRequestSummary;
-
   LearningObserver(ResourcePrefetchPredictor* predictor,
                    const size_t expected_url_visit_count,
                    const PageRequestSummary& expected_summary,
@@ -323,7 +318,7 @@ class PrefetchingObserver : public TestLoadingObserver {
 
 class ResourcePrefetchPredictorBrowserTest : public InProcessBrowserTest {
  protected:
-  using URLRequestSummary = ResourcePrefetchPredictor::URLRequestSummary;
+  using URLRequestSummary = URLRequestSummary;
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII("force-fieldtrials", "trial/group");
@@ -475,6 +470,7 @@ class ResourcePrefetchPredictorBrowserTest : public InProcessBrowserTest {
     resource->request.resource_type = resource_type;
     resource->request.priority = priority;
     resource->request.has_validators = true;
+    resource->request.request_url = resource_url;
     return resource;
   }