predictors: Add resource type to manifest.

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 <cstddef>
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.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 "components/precache/core/proto/precache.pb.h"
 
 namespace sql {
 class Statement;
 }
 
 namespace predictors {
 
-// From resource_prefetch_predictor.proto.
-using RedirectStat = RedirectData_RedirectStat;
-
 // Interface for database tables used by the ResourcePrefetchPredictor.
 // All methods except the constructor and destructor need to be called on the DB
 // thread.
 //
 // Currently manages:
 //  - UrlResourceTable - resources per Urls.
 //  - UrlRedirectTable - redirects per Urls.
 //  - HostResourceTable - resources per host.
 //  - HostRedirectTable - redirects per host.
 class ResourcePrefetchPredictorTables : public PredictorTableBase {
@@ skipping 63 matching lines @@
   // 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);
 
+  // Computes score of |data|.
+  static float ComputePrecacheResourceScore(
+      const precache::PrecacheResource& data);
+
   // Removes the origins with more than |max_consecutive_misses| consecutive
   // misses from |data|.
   static void TrimOrigins(OriginData* data, size_t max_consecutive_misses);
 
   // Sorts the origins by score, decreasing.
   static void SortOrigins(OriginData* data);
 
-  // Computes score of |data|.
+  // Computes score of |origin|.
   static float ComputeOriginScore(const OriginStat& origin);
 
   // 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, MANIFEST, ORIGIN };
 
   enum class TableOperationType { INSERT, REMOVE };
 
   friend class PredictorDatabaseInternal;
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseVersionIsSet);
   FRIEND_TEST_ALL_PREFIXES(ResourcePrefetchPredictorTablesTest,
                            DatabaseIsResetWhenIncompatible);
 
   // Database version. Always increment it when any change is made to the data
   // schema (including the .proto).
-  static constexpr int kDatabaseVersion = 7;
+  static constexpr int kDatabaseVersion = 8;
 
   // 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);
   void GetAllManifestDataHelper(ManifestDataMap* manifest_map);
   void GetAllOriginDataHelper(OriginDataMap* manifest_map);
 
@@ skipping 21 matching lines @@
 
   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_