predictors: ResourcePrefetchPredictorTables cleanup.

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 <cstddef>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/ptr_util.h"
 #include "chrome/browser/predictors/predictor_table_base.h"
 #include "chrome/browser/predictors/resource_prefetch_common.h"
 #include "chrome/browser/predictors/resource_prefetch_predictor.pb.h"
-#include "content/public/common/resource_type.h"
-#include "net/base/request_priority.h"
-#include "url/gurl.h"
 
 namespace sql {
 class Statement;
 }
 
 namespace predictors {
 
 // From resource_prefetch_predictor.proto.
 using RedirectStat = RedirectData_RedirectStat;
 
@@ skipping 45 matching lines @@
 
   // Wrapper over DeleteRedirectData for convenience.
   virtual void DeleteSingleRedirectDataPoint(const std::string& key,
                                              PrefetchKeyType key_type);
 
   // Deletes all data in all the tables.
   virtual void DeleteAllData();
 
   // Removes the resources with more than |max_consecutive_misses| consecutive
   // misses from |data|.
   static void TrimResources(PrefetchData* data, size_t max_consecutive_misses);

[alexilin, 2016/11/04 15:32:37]

BTW, I think it's worth to exctract these static methods outside the class
because they're not connected.
What place is more right for it?
WDYT?

 
   // Sorts the resources by score, decreasing.
   static void SortResources(PrefetchData* data);
 
+  // Computes score of |data|.
+  static float ComputeResourceScore(const ResourceData& data);
+
   // Removes the redirects with more than |max_consecutive_misses| consecutive
   // misses from |data|.
   static void TrimRedirects(RedirectData* data, size_t max_consecutive_misses);
 
   // The maximum length of the string that can be stored in the DB.
   static constexpr size_t kMaxStringLength = 1024;
 
+ protected:
+  // Protected for testing. Use PredictorDatabase::resource_prefetch_tables()
+  // instead of this constructor.
+  ResourcePrefetchPredictorTables();
+  ~ResourcePrefetchPredictorTables() override;
+
  private:
   // Represents the type of information that is stored in prefetch database.
   enum class PrefetchDataType { RESOURCE, REDIRECT };
 
   enum class TableOperationType { INSERT, REMOVE };
 
   friend class PredictorDatabaseInternal;
-  friend class MockResourcePrefetchPredictorTables;
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseVersionIsSet);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseIsResetWhenIncompatible);
-  FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
-                           ComputeResourceScore);
 
-  ResourcePrefetchPredictorTables();
-  ~ResourcePrefetchPredictorTables() override;
+  // Database version. Always increment it when any change is made to the data
+  // schema (including the .proto).
+  static constexpr int kDatabaseVersion = 5;
 
   // Helper functions below help perform functions on the Url and host table
   // using the same code.
   void GetAllResourceDataHelper(PrefetchKeyType key_type,
                                 PrefetchDataMap* data_map);
   void GetAllRedirectDataHelper(PrefetchKeyType key_type,
                                 RedirectDataMap* redirect_map);
   bool UpdateDataHelper(PrefetchKeyType key_type,
                         PrefetchDataType data_type,
                         const std::string& key,
                         const google::protobuf::MessageLite& data);
   void DeleteDataHelper(PrefetchKeyType key_type,
                         PrefetchDataType data_type,
                         const std::vector<std::string>& keys);
 
-  // Computes score of |data|.
-  static float ComputeResourceScore(const ResourceData& data);
-
-  // PredictorTableBase methods.
+  // PredictorTableBase:
   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 = 5;
+  bool DropTablesIfOutdated();
+  int GetDatabaseVersion();
+  bool SetDatabaseVersion(int version);
 
-  static bool DropTablesIfOutdated(sql::Connection* db);
-  static int GetDatabaseVersion(sql::Connection* db);
-  static bool SetDatabaseVersion(sql::Connection* db, int version);
-
-  // Helper to return Statements for cached Statements.
+  // Helper to return cached Statements.
   std::unique_ptr<sql::Statement> GetTableUpdateStatement(
       PrefetchKeyType key_type,
       PrefetchDataType data_type,
       TableOperationType op_type);
 
   static const char* GetTableName(PrefetchKeyType key_type,
                                   PrefetchDataType data_type);
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePrefetchPredictorTables);
 };
 
 }  // namespace predictors
 
 #endif  // CHROME_BROWSER_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_TABLES_H_