Refactor the resource_prefetch_predictor.

chrome/browser/predictors/resource_prefetch_predictor_tables.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_TABLES_H_
 #define CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_
 
 #include <stddef.h>
 
 #include <map>
@@ skipping 22 matching lines @@
 // All methods except the constructor and destructor need to be called on the DB
 // thread.
 //
 // Currently manages:
 //  - UrlResourceTable - resources per Urls.
 //  - UrlMetadataTable - misc data for Urls (like last visit time).
 //  - HostResourceTable - resources per host.
 //  - HostMetadataTable - misc data for hosts.
 class ResourcePrefetchPredictorTables : public PredictorTableBase {
  public:
-  // Used in the UrlResourceTable and HostResourceTable to store resources
-  // required for the page or host.
-  struct ResourceRow {
-    ResourceRow();
-    ResourceRow(const ResourceRow& other);
-    ResourceRow(const std::string& resource_url,
-                content::ResourceType resource_type,
-                int number_of_hits,
-                int number_of_misses,
-                int consecutive_misses,
-                double average_position,
-                net::RequestPriority priority,
-                bool has_validators,
-                bool always_revalidate);
-    void UpdateScore();
-    bool operator==(const ResourceRow& rhs) const;
-    static void FromProto(const ResourceData& proto, ResourceRow* row);
-    void ToProto(ResourceData* resource_data) const;
-
-    GURL resource_url;
-    content::ResourceType resource_type;
-    size_t number_of_hits;
-    size_t number_of_misses;
-    size_t consecutive_misses;
-    double average_position;
-    net::RequestPriority priority;
-    bool has_validators;
-    bool always_revalidate;
-
-    // Not stored.
-    float score;
-  };
-  typedef std::vector<ResourceRow> ResourceRows;
-
-  // Sorts the resource rows by score, decreasing.
-  static void SortResourceRows(ResourceRows* rows);
+  // Sorts the resources by score, decreasing
+  static void SortResources(std::vector<ResourceData>* resources);
 
   // Aggregated data for a Url or Host. Although the data differs slightly, we
   // store them in the same structure, because most of the fields are common and
   // it allows us to use the same functions.
   struct PrefetchData {
     PrefetchData(PrefetchKeyType key_type, const std::string& primary_key);
     PrefetchData(const PrefetchData& other);
     ~PrefetchData();
-    bool operator==(const PrefetchData& rhs) const;
 
     bool is_host() const { return key_type == PREFETCH_KEY_TYPE_HOST; }
 
     // Is the data a host as opposed to a Url?
     PrefetchKeyType key_type;  // Not const to be able to assign.
-    std::string primary_key;  // is_host() ? main frame url : host.
+    std::string primary_key;   // is_host() ? host : main frame url.
 
     base::Time last_visit;
-    ResourceRows resources;
+    std::vector<ResourceData> resources;
   };
   // Map from primary key to PrefetchData for the key.
   typedef std::map<std::string, PrefetchData> PrefetchDataMap;
 
   // Returns data for all Urls and Hosts.
   virtual void GetAllData(PrefetchDataMap* url_data_map,
                           PrefetchDataMap* host_data_map);
 
   // Updates data for a Url and a host. If either of the |url_data| or
   // |host_data| has an empty primary key, it will be ignored.
@@ skipping 16 matching lines @@
   // The maximum length of the string that can be stored in the DB.
   static constexpr size_t kMaxStringLength = 1024;
 
  private:
   friend class PredictorDatabaseInternal;
   friend class MockResourcePrefetchPredictorTables;
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseVersionIsSet);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseIsResetWhenIncompatible);
+  FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest, ComputeScore);
 
   ResourcePrefetchPredictorTables();
   ~ResourcePrefetchPredictorTables() override;
 
   // Helper functions below help perform functions on the Url and host table
   // using the same code.
   void GetAllDataHelper(PrefetchKeyType key_type,
                         PrefetchDataMap* data_map,
                         std::vector<std::string>* to_delete);
   bool UpdateDataHelper(const PrefetchData& data);
   void DeleteDataHelper(PrefetchKeyType key_type,
                         const std::vector<std::string>& keys);
 
   // Returns true if the strings in the |data| are less than |kMaxStringLength|
   // in length.
   static bool StringsAreSmallerThanDBLimit(const PrefetchData& data);
 
+  // Computes score of |data|

[pasko, 2016/09/21 17:38:36]

Except for end-of-line case, all comments should be written as complete
sentences, including a period at the end.

See:
https://google.github.io/styleguide/cppguide.html#Punctuation,_Spelling_and_G...

Please do it in all comments you added/modified in this change.

[alexilin, 2016/09/22 11:21:15]

Feel free to leave more grammar-nazi comments!

+  static float ComputeScore(const ResourceData& data);
+
   // PredictorTableBase methods.
   void CreateTableIfNonExistent() override;
   void LogDatabaseStats() override;
 
   // Database version. Always increment it when any change is made to the data
   // schema (including the .proto).
   static constexpr int kDatabaseVersion = 2;
 
   static bool DropTablesIfOutdated(sql::Connection* db);
   static int GetDatabaseVersion(sql::Connection* db);
@@ skipping 10 matching lines @@
   sql::Statement* GetHostResourceUpdateStatement();
   sql::Statement* GetHostMetadataDeleteStatement();
   sql::Statement* GetHostMetadataUpdateStatement();
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictorTables);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_