predictors: Move more methods from ResourcePrefetchPredictor into LoadingDataCollector.

chrome/browser/predictors/resource_prefetch_predictor.h

 // 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.
 
 #ifndef CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_
 #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 24 matching lines @@
 
 class PredictorsHandler;
 class Profile;
 
 namespace net {
 class URLRequest;
 }
 
 namespace predictors {
 
+struct OriginRequestSummary;
+struct URLRequestSummary;
+struct PageRequestSummary;
+
 namespace internal {
 constexpr char kResourcePrefetchPredictorPrefetchingDurationHistogram[] =
     "ResourcePrefetchPredictor.PrefetchingDuration";
 
 const uint32_t kVersionedRemovedExperiment = 0x03ff25e3;
 const uint32_t kUnusedRemovedExperiment = 0xf7f77166;
 const uint32_t kNoStoreRemovedExperiment = 0xd90a199a;
 
 struct ManifestCompare {
   bool operator()(const precache::PrecacheManifest& lhs,
@@ skipping 52 matching lines @@
 // * ResourcePrefetcher - Lives entirely on the IO thread, owned by the
 //   ResourcePrefetcherManager, and issues net::URLRequest to fetch resources.
 //
 // TODO(zhenw): Currently only main frame requests/redirects/responses are
 // recorded. Consider recording sub-frame responses independently or together
 // with main frame.
 class ResourcePrefetchPredictor
     : public history::HistoryServiceObserver,
       public precache::PrecacheManager::Delegate {
  public:
-  // Data collected for origin-based prediction, for a single origin during a
-  // page load (see PageRequestSummary).
-  struct OriginRequestSummary {
-    OriginRequestSummary();
-    OriginRequestSummary(const OriginRequestSummary& other);
-    ~OriginRequestSummary();
-
-    GURL origin;
-    bool always_access_network;
-    bool accessed_network;
-    int first_occurrence;
-  };
-
-  // Stores the data that we need to get from the URLRequest.
-  struct URLRequestSummary {
-    URLRequestSummary();
-    URLRequestSummary(const URLRequestSummary& other);
-    ~URLRequestSummary();
-
-    NavigationID navigation_id;
-    GURL resource_url;
-    GURL request_url;  // URL after all redirects.
-    content::ResourceType resource_type;
-    net::RequestPriority priority;
-    base::TimeTicks response_time;
-    bool before_first_contentful_paint;
-
-    // Only for responses.
-    std::string mime_type;
-    bool was_cached;
-    GURL redirect_url;  // Empty unless request was redirected to a valid url.
-
-    bool has_validators;
-    bool always_revalidate;
-    bool is_no_store;
-    bool network_accessed;
-
-    // Initializes a |URLRequestSummary| from a |URLRequest| response.
-    // Returns true for success. Note: NavigationID is NOT initialized
-    // by this function.
-    static bool SummarizeResponse(const net::URLRequest& request,
-                                  URLRequestSummary* summary);
-  };
-
-  // Stores the data learned from a single navigation.
-  struct PageRequestSummary {
-    explicit PageRequestSummary(const GURL& main_frame_url);
-    PageRequestSummary(const PageRequestSummary& other);
-    ~PageRequestSummary();
-
-    GURL main_frame_url;
-    GURL initial_url;
-    base::TimeTicks first_contentful_paint;
-
-    // Stores all subresource requests within a single navigation, from initial
-    // main frame request to navigation completion.
-    std::vector<URLRequestSummary> subresource_requests;
-    // Map of origin -> OriginRequestSummary. Only one instance of each origin
-    // is kept per navigation, but the summary is updated several times.
-    std::map<GURL, OriginRequestSummary> origins;
-  };
-
   // Stores a result of prediction. Essentially, |subresource_urls| is main
   // result and other fields are used for diagnosis and histograms reporting.
   struct Prediction {
     Prediction();
     Prediction(const Prediction& other);
     ~Prediction();
 
     bool is_host;
     bool is_redirected;
     std::string main_frame_key;
@@ skipping 26 matching lines @@
   ResourcePrefetchPredictor(const LoadingPredictorConfig& config,
                             Profile* profile);
   ~ResourcePrefetchPredictor() override;
 
   // Starts initialization by posting a task to the DB sequence of the
   // ResourcePrefetchPredictorTables to read the predictor database. Virtual for
   // testing.
   virtual void StartInitialization();
   virtual void Shutdown();
 
-  // Determines the resource type from the declared one, falling back to MIME
-  // type detection when it is not explicit.
-  static content::ResourceType GetResourceType(
-      content::ResourceType resource_type,
-      const std::string& mime_type);
-
-  // Determines the ResourceType from the mime type, defaulting to the
-  // |fallback| if the ResourceType could not be determined.
-  static content::ResourceType GetResourceTypeFromMimeType(
-      const std::string& mime_type,
-      content::ResourceType fallback);
-
   // Called when ResourcePrefetcher is finished, i.e. there is nothing pending
   // in flight.
   void OnPrefetchingFinished(
       const GURL& main_frame_url,
       std::unique_ptr<ResourcePrefetcher::PrefetcherStats> stats);
 
   // Returns true if prefetching data exists for the |main_frame_url|.
   virtual bool IsUrlPrefetchable(const GURL& main_frame_url) const;
 
   // Returns true iff |resource| has sufficient confidence level and required
@@ skipping 17 matching lines @@
   // prefetched. |prediction| pointer may be nullptr to get return value only.
   virtual bool GetPrefetchData(const GURL& main_frame_url,
                                Prediction* prediction) const;
 
   // Returns true iff there is OriginData that can be used for a |url| and fills
   // |prediction| with origins and hosts that need to be preconnected and
   // preresolved respectively.
   virtual bool PredictPreconnectOrigins(const GURL& url,
                                         PreconnectPrediction* prediction) const;
 
+  // Called by the collector after a page has finished loading resources and
+  // assembled a PageRequestSummary.
+  virtual void RecordPageRequestSummary(
+      std::unique_ptr<PageRequestSummary> summary);
+
  private:
-  // 'LoadingPredictorObserver' calls the below functions to inform the
-  // predictor of main frame and resource requests. Should only be called if the
-  // corresponding Should* functions return true.
-  void RecordURLRequest(const URLRequestSummary& request);
-  void RecordURLResponse(const URLRequestSummary& response);
-  void RecordURLRedirect(const URLRequestSummary& response);
-
-  // Called when the main frame of a page completes loading.
-  void RecordMainFrameLoadComplete(const NavigationID& navigation_id);
-
-  // Called after the main frame's first contentful paint.
-  void RecordFirstContentfulPaint(
-      const NavigationID& navigation_id,
-      const base::TimeTicks& first_contentful_paint);
-
   // Starts prefetching for |main_frame_url| from a |prediction|.
   void StartPrefetching(const GURL& main_frame_url,
                         const Prediction& prediction);
 
   // Stops prefetching that may be in progress corresponding to
   // |main_frame_url|.
   void StopPrefetching(const GURL& main_frame_url);
 
   friend class LoadingPredictor;
   friend class ::PredictorsHandler;
@@ skipping 38 matching lines @@
                            TestPrefetchingDurationHistogram);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest,
                            TestRecordFirstContentfulPaint);
 
   enum InitializationState {
     NOT_INITIALIZED = 0,
     INITIALIZING = 1,
     INITIALIZED = 2
   };
   // Returns true if the request (should have a response in it) is "no-store".
   static bool IsNoStore(const net::URLRequest& request);

[alexilin, 2017/06/30 14:58:49]

Implementation of this function was moved into anonymous namespace in
loading_data_collector.cc
Please, remove the declaration from here.

[trevordixon, 2017/07/11 11:08:08]

Done.

 
-  // Functions called on different network events pertaining to the loading of
-  // main frame resource or sub resources.
-  void OnMainFrameRequest(const URLRequestSummary& request);
-  void OnMainFrameRedirect(const URLRequestSummary& response);
-  void OnSubresourceResponse(const URLRequestSummary& response);
-  void OnSubresourceRedirect(const URLRequestSummary& response);
-
-  // Called when onload completes for a navigation. We treat this point as the
-  // "completion" of the navigation. The resources requested by the page up to
-  // this point are the only ones considered for prefetching.
-  void OnNavigationComplete(const NavigationID& nav_id_without_timing_info);
-
   // Returns true iff one of the following conditions is true
   // * |redirect_data| contains confident redirect endpoint for |entry_point|
   //   and assigns it to the |redirect_endpoint|
   //
   // * |redirect_data| doens't contain an entry for |entry_point| and assigns
   //   |entry_point| to the |redirect_endpoint|.
   bool GetRedirectEndpoint(const std::string& entry_point,
                            const RedirectDataMap& redirect_data,
                            std::string* redirect_endpoint) const;
 
@@ skipping 16 matching lines @@
                     std::unique_ptr<PrefetchDataMap> host_resource_data,
                     std::unique_ptr<RedirectDataMap> url_redirect_data,
                     std::unique_ptr<RedirectDataMap> host_redirect_data,
                     std::unique_ptr<ManifestDataMap> manifest_data,
                     std::unique_ptr<OriginDataMap> origin_data);
 
   // Called during initialization when history is read and the predictor
   // database has been read.
   void OnHistoryAndCacheLoaded();
 
-  // Cleanup inflight_navigations_ and call a cleanup for stats_collector_.
-  void CleanupAbandonedNavigations(const NavigationID& navigation_id);
-
-  // Deletes all URLs from the predictor database, the caches and removes all
-  // inflight navigations.
+  // Deletes all URLs from the predictor database and caches.
   void DeleteAllUrls();
 
   // Deletes data for the input |urls| and their corresponding hosts from the
   // predictor database and caches.
   void DeleteUrls(const history::URLRows& urls);
 
   // Callback for GetUrlVisitCountTask.
   void OnVisitCountLookup(size_t url_visit_count,
                           const PageRequestSummary& summary);
 
@@ skipping 55 matching lines @@
   scoped_refptr<ResourcePrefetcherManager> prefetch_manager_;
   base::CancelableTaskTracker history_lookup_consumer_;
 
   std::unique_ptr<PrefetchDataMap> url_resource_data_;
   std::unique_ptr<PrefetchDataMap> host_resource_data_;
   std::unique_ptr<RedirectDataMap> url_redirect_data_;
   std::unique_ptr<RedirectDataMap> host_redirect_data_;
   std::unique_ptr<ManifestDataMap> manifest_data_;
   std::unique_ptr<OriginDataMap> origin_data_;
 
-  NavigationMap inflight_navigations_;
-
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
       history_service_observer_;
 
   base::WeakPtrFactory<ResourcePrefetchPredictor> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictor);
 };
 
 // An interface used to notify that data in the ResourcePrefetchPredictor
 // has changed. All methods are invoked on the UI thread.
 class TestObserver {
  public:
   // De-registers itself from |predictor_| on destruction.
   virtual ~TestObserver();
 
   virtual void OnPredictorInitialized() {}
 
-  virtual void OnNavigationLearned(
-      size_t url_visit_count,
-      const ResourcePrefetchPredictor::PageRequestSummary& summary) {}
+  virtual void OnNavigationLearned(size_t url_visit_count,
+                                   const PageRequestSummary& summary) {}
 
   virtual void OnPrefetchingStarted(const GURL& main_frame_url) {}
 
   virtual void OnPrefetchingStopped(const GURL& main_frame_url) {}
 
   virtual void OnPrefetchingFinished(const GURL& main_frame_url) {}
 
  protected:
   // |predictor| must be non-NULL and has to outlive the TestObserver.
   // Also the predictor must not have a TestObserver set.
   explicit TestObserver(ResourcePrefetchPredictor* predictor);
 
  private:
   ResourcePrefetchPredictor* predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_