predictors: Move more methods from ResourcePrefetchPredictor into LoadingDataCollector.

chrome/browser/predictors/resource_prefetch_predictor_browsertest.cc

 // Copyright 2016 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 <algorithm>
 #include <cstddef>
 #include <set>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 71 matching lines @@
 struct ResourceSummary {
   ResourceSummary()
       : version(0),
         is_no_store(false),
         is_external(false),
         is_observable(true),
         is_prohibited(false) {
     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.
   bool is_no_store;
   // True iff a request for this resource must be ignored by the custom handler.
   bool is_external;
   // True iff the LearningObserver must observe this resource.
   bool is_observable;
   // A request with |is_prohibited| set to true makes the test that originates
   // the request fail.
@@ skipping 41 matching lines @@
 
   void Wait() { run_loop_.Run(); }
 
  private:
   content::BrowsingDataRemover* remover_;
   base::RunLoop run_loop_;
 
   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) {
                      return x.resource_url < y.resource_url;
                    });
   subresources->erase(
       std::unique(subresources->begin(), subresources->end(),
                   [](const URLRequestSummary& x, const URLRequestSummary& y) {
                     return x.resource_url == y.resource_url;
                   }),
@@ skipping 66 matching lines @@
   return resource_url;
 }
 
 }  // namespace
 
 // Helper class to track and allow waiting for a single OnNavigationLearned
 // event. The information provided by this event is also used to verify that
 // 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,
                    bool match_navigation_id,
                    bool match_before_first_contentful_paint)
       : TestObserver(predictor),
         url_visit_count_(expected_url_visit_count),
         summary_(expected_summary),
         match_navigation_id_(match_navigation_id),
         match_before_first_contentful_paint_(
@@ skipping 61 matching lines @@
 
  private:
   base::RunLoop run_loop_;
   GURL main_frame_url_;
 
   DISALLOW_COPY_AND_ASSIGN(PrefetchingObserver);
 };
 
 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");
     std::string parameter = base::StringPrintf(
         "trial.group:%s/%s", kModeParamName, kExternalPrefetchingMode);
     command_line->AppendSwitchASCII("force-fieldtrial-params", parameter);
     std::string enabled_feature = base::StringPrintf(
         "%s<trial", kSpeculativeResourcePrefetchingFeatureName);
     command_line->AppendSwitchASCII("enable-features", enabled_feature);
   }
@@ skipping 131 matching lines @@
                                net::RequestPriority priority) {
     auto pair_and_whether_inserted =
         resources_.insert(std::make_pair(resource_url, ResourceSummary()));
     EXPECT_TRUE(pair_and_whether_inserted.second) << resource_url
                                                   << " was inserted twice";
     ResourceSummary* resource = &pair_and_whether_inserted.first->second;
     resource->request.resource_url = resource_url;
     resource->request.resource_type = resource_type;
     resource->request.priority = priority;
     resource->request.has_validators = true;
+    resource->request.request_url = resource_url;
     return resource;
   }
 
   ResourceSummary* AddExternalResource(const GURL& resource_url,
                                        content::ResourceType resource_type,
                                        net::RequestPriority priority) {
     auto* resource = AddResource(resource_url, resource_type, priority);
     resource->is_external = true;
     return resource;
   }
@@ skipping 513 matching lines @@
   AddResourcesFromSubresourceHtml();
 
   NavigateToURLAndCheckSubresources(initial_url);
   ClearCache();
   NavigateToURLAndCheckSubresources(initial_url);
   ClearCache();
   NavigateToURLAndCheckPrefetching(initial_url);
 }
 
 }  // namespace predictors