predictors: Use redirect data in prefetch.

chrome/browser/predictors/resource_prefetch_predictor_tables.cc

 // 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.
 
 #include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 97 matching lines @@
   auto new_end =
       std::remove_if(data->mutable_redirect_endpoints()->begin(),
                      data->mutable_redirect_endpoints()->end(),
                      [max_consecutive_misses](const RedirectStat& x) {
                        return x.consecutive_misses() >= max_consecutive_misses;
                      });
   data->mutable_redirect_endpoints()->erase(
       new_end, data->mutable_redirect_endpoints()->end());
 }
 
-// static
-void ResourcePrefetchPredictorTables::SortRedirects(RedirectData* data) {
-  std::sort(data->mutable_redirect_endpoints()->begin(),
-            data->mutable_redirect_endpoints()->end(),
-            [](const RedirectStat& x, const RedirectStat& y) {
-              // Decreasing score ordering.
-              return ComputeRedirectScore(x) > ComputeRedirectScore(y);
-            });
-}
-
 void ResourcePrefetchPredictorTables::GetAllData(
     PrefetchDataMap* url_data_map,
     PrefetchDataMap* host_data_map,
     RedirectDataMap* url_redirect_data_map,
     RedirectDataMap* host_redirect_data_map) {
   DCHECK_CURRENTLY_ON(BrowserThread::DB);
   if (CantAccessDatabase())
     return;
 
   DCHECK(url_data_map);
@@ skipping 143 matching lines @@
   const char* table_name = GetTableName(key_type, PrefetchDataType::REDIRECT);
   Statement redirect_reader(DB()->GetUniqueStatement(
       base::StringPrintf("SELECT * FROM %s", table_name).c_str()));
 
   RedirectData data;
   std::string key;
   while (StepAndInitializeProtoData(&redirect_reader, &key, &data)) {
     data_map->insert(std::make_pair(key, data));
     DCHECK_EQ(data.primary_key(), key);
   }
-
-  // Sort each of the redirect vectors by score.
-  for (auto& kv : *data_map) {
-    SortRedirects(&(kv.second));
-  }
 }
 
 bool ResourcePrefetchPredictorTables::UpdateDataHelper(
     PrefetchKeyType key_type,
     PrefetchDataType data_type,
     const std::string& key,
     const MessageLite& data) {
   // Delete the older data from the table.
   std::unique_ptr<Statement> deleter(
       GetTableUpdateStatement(key_type, data_type, TableOperationType::REMOVE));
@@ skipping 59 matching lines @@
       type_multiplier = 1;
   }
 
   constexpr int kMaxResourcesPerType = 100;
   return kMaxResourcesPerType *
              (priority_multiplier * 100 + type_multiplier * 10) -
          data.average_position();
 }
 
 // static
-float ResourcePrefetchPredictorTables::ComputeRedirectScore(
-    const RedirectStat& data) {
-  // TODO(alexilin): Invent some scoring.
-  return 0.0;
-}
-
-// static
 bool ResourcePrefetchPredictorTables::DropTablesIfOutdated(
     sql::Connection* db) {
   int version = GetDatabaseVersion(db);
   bool success = true;
   // Too new is also a problem.
   bool incompatible_version = version != kDatabaseVersion;
 
   // These are deprecated tables but they still have to be removed if present.
   const char kUrlMetadataTableName[] =
       "resource_prefetch_predictor_url_metadata";
@@ skipping 125 matching lines @@
       return is_host ? kHostResourceTableName : kUrlResourceTableName;
     case PrefetchDataType::REDIRECT:
       return is_host ? kHostRedirectTableName : kUrlRedirectTableName;
   }
 
   NOTREACHED();
   return nullptr;
 }
 
 }  // namespace predictors