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 161 matching lines @@
     Prediction();
     Prediction(const Prediction& other);
     ~Prediction();
 
     bool is_host;
     bool is_redirected;
     std::string main_frame_key;
     std::vector<GURL> subresource_urls;
   };
 
+  enum InitializationState {
+    NOT_INITIALIZED = 0,
+    INITIALIZING = 1,
+    INITIALIZED = 2
+  };
+
   // Used for reporting redirect prediction success/failure in histograms.
   // NOTE: This enumeration is used in histograms, so please do not add entries
   // in the middle.
   enum class RedirectStatus {
     NO_REDIRECT,
     NO_REDIRECT_BUT_PREDICTED,
     REDIRECT_NOT_PREDICTED,
     REDIRECT_WRONG_PREDICTED,
     REDIRECT_CORRECTLY_PREDICTED,
     MAX
@@ skipping 45 matching lines @@
   // Sets the |stats_collector| which is used to report histograms.
   void SetStatsCollector(LoadingStatsCollector* stats_collector);
 
   // Returns true iff there is PrefetchData that can be used for a
   // |main_frame_url| and fills |prediction| with resources that need to be
   // prefetched. |prediction| pointer may be nullptr to get return value only.
   virtual bool GetPrefetchData(const GURL& main_frame_url,
                                Prediction* prediction) const;
 
  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 30 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest, PopulateFromManifest);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest, GetRedirectEndpoint);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest, GetPrefetchData);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest,
                            TestPrecisionRecallHistograms);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest,
                            TestPrefetchingDurationHistogram);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTest,
                            TestRecordFirstContentfulPaint);
 
-  enum InitializationState {
-    NOT_INITIALIZED = 0,
-    INITIALIZING = 1,
-    INITIALIZED = 2
-  };
   typedef GlowplugKeyValueData<PrefetchData, internal::LastVisitTimeCompare>
       PrefetchDataMap;
   typedef GlowplugKeyValueData<RedirectData, internal::LastVisitTimeCompare>
       RedirectDataMap;
   typedef GlowplugKeyValueData<precache::PrecacheManifest,
                                internal::ManifestCompare>
       ManifestDataMap;
   typedef GlowplugKeyValueData<OriginData, internal::LastVisitTimeCompare>
       OriginDataMap;
   typedef std::map<NavigationID, std::unique_ptr<PageRequestSummary>>
       NavigationMap;
 
   // Returns true if the request (should have a response in it) is "no-store".
   static bool IsNoStore(const net::URLRequest& request);
 
-  // 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);
+  // Called by the collector after a page has finished loading resources and
+  // assembled a PageRequestSummary.
+  void HandlePageRequestSummary(std::unique_ptr<PageRequestSummary> summary);

[alexilin, 2017/06/14 11:41:54]

s/HandlePageRequestSummary/RecordPageRequestSummary
It should be a public method.

[trevordixon, 2017/06/16 05:11:28]

Done.

[alexilin, 2017/06/16 09:31:57]

You didn't rename the method :)

[trevordixon, 2017/06/16 10:53:19]

Oops, missed that line! Done.

 
   // 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 10 matching lines @@
   // prefetched. |urls| may be nullptr to get the return value only.
   bool PopulateFromManifest(const std::string& manifest_host,
                             std::vector<GURL>* urls) const;
 
   void InitializeOnDBThread();
 
   // 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.
   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,
@@ skipping 30 matching lines @@
   // Updates list of resources in the |resource_data| for the |key| according to
   // the |manifest|.
   void UpdatePrefetchDataByManifest(const std::string& key,
                                     PrefetchDataMap* resource_data,
                                     const precache::PrecacheManifest& manifest);
 
   // Used to connect to HistoryService or register for service loaded
   // notificatioan.
   void ConnectToHistoryService();
 
+  InitializationState initialization_state() { return initialization_state_; }
+
   // Used for testing to inject mock tables.
   void set_mock_tables(scoped_refptr<ResourcePrefetchPredictorTables> tables) {
     tables_ = tables;
   }
 
   // For testing.
   void set_mock_resource_prefetcher_manager(
       scoped_refptr<ResourcePrefetcherManager> prefetch_manager) {
     prefetch_manager_ = prefetch_manager;
   }
@@ skipping 48 matching lines @@
 
  private:
   ResourcePrefetchPredictor* predictor_;
 
   DISALLOW_COPY_AND_ASSIGN(TestObserver);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_