Redirect handling in resource prefetch predictor

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 166 matching lines @@
     std::unique_ptr<ResourcePrefetcher::RequestVector> requests;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(Result);
   };
 
   typedef ResourcePrefetchPredictorTables::ResourceRow ResourceRow;
   typedef ResourcePrefetchPredictorTables::ResourceRows ResourceRows;
   typedef ResourcePrefetchPredictorTables::PrefetchData PrefetchData;
   typedef ResourcePrefetchPredictorTables::PrefetchDataMap PrefetchDataMap;
+
+  typedef ResourcePrefetchPredictorTables::RedirectStatRow RedirectStatRow;
+  typedef ResourcePrefetchPredictorTables::RedirectStatRows RedirectStatRows;
+  typedef ResourcePrefetchPredictorTables::RedirectData RedirectData;
+  typedef ResourcePrefetchPredictorTables::RedirectDataMap RedirectDataMap;
+
   typedef std::map<NavigationID, linked_ptr<std::vector<URLRequestSummary> > >

[mattcary, 2016/09/09 13:19:21]

To be consistent with other code, should remove spaces between angle brackets
(...URLRequestSummary>>>)

       NavigationMap;
   typedef std::map<NavigationID, std::unique_ptr<Result>> ResultsMap;
+  typedef std::map<NavigationID, linked_ptr<std::vector<GURL> > > RedirectsMap;

[mattcary, 2016/09/09 09:16:11]

Should use unique_ptr instead, see

https://www.chromium.org/developers/smart-pointer-guidelines

For bonus points, update other linked_ptr usages to unique_ptr.

[alexilin, 2016/09/09 13:59:19]

Yep, I used linked_ptr like in a rest of code but I've already seen that it's
deprecated now. Ok, I'll update all pointers.

 
   // Returns true if the main page request is supported for prediction.
   static bool IsHandledMainPage(net::URLRequest* request);
 
   // Returns true if the subresource request is supported for prediction.
   static bool IsHandledSubresource(net::URLRequest* request,
                                    content::ResourceType resource_type);
 
   // Returns true if the subresource has a supported type.
   static bool IsHandledResourceType(content::ResourceType resource_type,
@@ skipping 33 matching lines @@
   void StartPrefetching(const NavigationID& navigation_id);
 
   // Stops prefetching that may be in progress corresponding to |navigation_id|.
   void StopPrefetching(const NavigationID& navigation_id);
 
   // Starts initialization by posting a task to the DB thread to read the
   // predictor database.
   void StartInitialization();
 
   // Callback for task to read predictor database. Takes ownership of
-  // |url_data_map| and |host_data_map|.
+  // all arguments.
   void CreateCaches(std::unique_ptr<PrefetchDataMap> url_data_map,
-                    std::unique_ptr<PrefetchDataMap> host_data_map);
+                    std::unique_ptr<PrefetchDataMap> host_data_map,
+                    std::unique_ptr<RedirectDataMap> url_redirect_data_map,
+                    std::unique_ptr<RedirectDataMap> host_redirect_data_map);
 
   // Called during initialization when history is read and the predictor
   // database has been read.
   void OnHistoryAndCacheLoaded();
 
   // Removes data for navigations where the onload never fired. Will cleanup
   // inflight_navigations_ and results_map_.
   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 visit_count,
                           const NavigationID& navigation_id,
-                          const std::vector<URLRequestSummary>& requests);
+                          const std::vector<URLRequestSummary>& requests,
+                          std::vector<GURL>* redirects);
 
   // Removes the oldest entry in the input |data_map|, also deleting it from the
   // predictor database.
   void RemoveOldestEntryInPrefetchDataMap(PrefetchKeyType key_type,
                                           PrefetchDataMap* data_map);
 
   // Merges resources in |new_resources| into the |data_map| and correspondingly
   // updates the predictor database.
   void LearnNavigation(const std::string& key,
                        PrefetchKeyType key_type,
                        const std::vector<URLRequestSummary>& new_resources,
                        size_t max_data_map_size,
                        PrefetchDataMap* data_map);
 
+  // Updates information about final redirect destination for all |keys| in
+  // |redirect_map| and correspondingly updates the predictor database
+  void LearnRedirects(const std::vector<std::string>& keys,
+                      PrefetchKeyType key_type,
+                      const std::string& final_redirect,
+                      size_t max_redirect_map_size,
+                      RedirectDataMap* redirect_map);
+
   // Reports overall page load time.
   void ReportPageLoadTimeStats(base::TimeDelta plt) const;
 
   // Reports page load time for prefetched and not prefetched pages
   void ReportPageLoadTimePrefetchStats(
       base::TimeDelta plt,
       bool prefetched,
       base::Callback<void(int)> report_network_type_callback,
       PrefetchKeyType key_type) const;
 
@@ skipping 40 matching lines @@
   scoped_refptr<ResourcePrefetchPredictorTables> tables_;
   scoped_refptr<ResourcePrefetcherManager> prefetch_manager_;
   base::CancelableTaskTracker history_lookup_consumer_;
 
   // Map of all the navigations in flight to their resource requests.
   NavigationMap inflight_navigations_;
 
   // Copy of the data in the predictor tables.
   std::unique_ptr<PrefetchDataMap> url_table_cache_;
   std::unique_ptr<PrefetchDataMap> host_table_cache_;
+  std::unique_ptr<RedirectDataMap> url_redirect_table_cache_;
+  std::unique_ptr<RedirectDataMap> host_redirect_table_cache_;
 
   ResultsMap results_map_;
+  RedirectsMap redirects_map_;
 
   ScopedObserver<history::HistoryService, history::HistoryServiceObserver>
       history_service_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictor);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_H_