Index: chrome/browser/predictors/predictor_database.cc |
=================================================================== |
--- chrome/browser/predictors/predictor_database.cc (revision 243063) |
+++ chrome/browser/predictors/predictor_database.cc (working copy) |
@@ -12,8 +12,6 @@ |
#include "base/strings/stringprintf.h" |
#include "chrome/browser/predictors/autocomplete_action_predictor_table.h" |
#include "chrome/browser/predictors/logged_in_predictor_table.h" |
-#include "chrome/browser/predictors/resource_prefetch_predictor.h" |
-#include "chrome/browser/predictors/resource_prefetch_predictor_tables.h" |
#include "chrome/browser/prerender/prerender_field_trial.h" |
#include "chrome/browser/profiles/profile.h" |
#include "content/public/browser/browser_thread.h" |
@@ -52,7 +50,6 @@ |
// Cancels pending DB transactions. Should only be called on the UI thread. |
void SetCancelled(); |
- bool is_resource_prefetch_predictor_enabled_; |
base::FilePath db_path_; |
scoped_ptr<sql::Connection> db_; |
@@ -60,7 +57,6 @@ |
// to using a WeakPtr instead. |
scoped_refptr<AutocompleteActionPredictorTable> autocomplete_table_; |
scoped_refptr<LoggedInPredictorTable> logged_in_table_; |
- scoped_refptr<ResourcePrefetchPredictorTables> resource_prefetch_tables_; |
DISALLOW_COPY_AND_ASSIGN(PredictorDatabaseInternal); |
}; |
@@ -70,12 +66,8 @@ |
: db_path_(profile->GetPath().Append(kPredictorDatabaseName)), |
db_(new sql::Connection()), |
autocomplete_table_(new AutocompleteActionPredictorTable()), |
- logged_in_table_(new LoggedInPredictorTable()), |
- resource_prefetch_tables_(new ResourcePrefetchPredictorTables()) { |
+ logged_in_table_(new LoggedInPredictorTable()) { |
db_->set_histogram_tag("Predictor"); |
- ResourcePrefetchPredictorConfig config; |
- is_resource_prefetch_predictor_enabled_ = |
- IsSpeculativeResourcePrefetchingEnabled(profile, &config); |
} |
PredictorDatabaseInternal::~PredictorDatabaseInternal() { |
@@ -97,7 +89,6 @@ |
autocomplete_table_->Initialize(db_.get()); |
logged_in_table_->Initialize(db_.get()); |
- resource_prefetch_tables_->Initialize(db_.get()); |
LogDatabaseStats(); |
} |
@@ -108,7 +99,6 @@ |
autocomplete_table_->SetCancelled(); |
logged_in_table_->SetCancelled(); |
- resource_prefetch_tables_->SetCancelled(); |
} |
void PredictorDatabaseInternal::LogDatabaseStats() { |
@@ -123,8 +113,6 @@ |
autocomplete_table_->LogDatabaseStats(); |
logged_in_table_->LogDatabaseStats(); |
- if (is_resource_prefetch_predictor_enabled_) |
- resource_prefetch_tables_->LogDatabaseStats(); |
} |
PredictorDatabase::PredictorDatabase(Profile* profile) |
@@ -150,11 +138,6 @@ |
return db_->logged_in_table_; |
} |
-scoped_refptr<ResourcePrefetchPredictorTables> |
- PredictorDatabase::resource_prefetch_tables() { |
- return db_->resource_prefetch_tables_; |
-} |
- |
sql::Connection* PredictorDatabase::GetDatabase() { |
return db_->db_.get(); |
} |