Seculative resource prefetching for URLs CL.

chrome/browser/predictors/predictor_database.cc

 // Copyright (c) 2012 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/predictor_database.h"
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/stringprintf.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/predictors/autocomplete_action_predictor_table.h"
+#include "chrome/browser/predictors/resource_prefetch_predictor_tables.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 
 namespace {
 
 // TODO(shishir): This should move to a more generic name.
 const FilePath::CharType kPredictorDatabaseName[] =
     FILE_PATH_LITERAL("Network Action Predictor");
@@ skipping 17 matching lines @@
   // constructor to ease construction/destruction of this object on one thread
   // but database access on the DB thread.
   void Initialize();
   void LogDatabaseStats();  //  DB Thread.
 
   // Cancels pending DB transactions. Should only be called on the UI thread.
   void SetCancelled();
 
   FilePath db_path_;
   sql::Connection db_;
+
+  // TODO(shishir): These tables may not need to be refcounted. Maybe move them
+  // to using a WeakPtr instead.
   scoped_refptr<AutocompleteActionPredictorTable> autocomplete_table_;
+  scoped_refptr<ResourcePrefetchPredictorTables> resource_prefetch_tables_;
 
   DISALLOW_COPY_AND_ASSIGN(PredictorDatabaseInternal);
 };
 
 
 PredictorDatabaseInternal::PredictorDatabaseInternal(Profile* profile)
     : db_path_(profile->GetPath().Append(kPredictorDatabaseName)),
-      autocomplete_table_(new AutocompleteActionPredictorTable()) {
+      autocomplete_table_(new AutocompleteActionPredictorTable()),
+      resource_prefetch_tables_(new ResourcePrefetchPredictorTables()) {
 }
 
 PredictorDatabaseInternal::~PredictorDatabaseInternal() {
 }
 
 void PredictorDatabaseInternal::Initialize() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   db_.set_exclusive_locking();
   bool success = db_.Open(db_path_);
 
   if (!success)
     return;
 
   autocomplete_table_->Initialize(&db_);
+  resource_prefetch_tables_->Initialize(&db_);
 
   LogDatabaseStats();
 }
 
 void PredictorDatabaseInternal::SetCancelled() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   autocomplete_table_->cancelled_.Set();
+  resource_prefetch_tables_->cancelled_.Set();

[willchan no longer on Chromium, 2012/06/18 20:15:12]

Isn't |cancelled_| an internal member variable? What's going on here? And
|cancelled_| looks like a protected member variable, which is disallowed by the
Google C++ style guide.

[Shishir, 2012/06/18 20:38:33]

Added an SetCancelled method for this. I had this in the initial refactored code
and was asked to remove it since the variable was accessible here.

 }
 
 void PredictorDatabaseInternal::LogDatabaseStats() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   int64 db_size;
   bool success = file_util::GetFileSize(db_path_, &db_size);
   DCHECK(success) << "Failed to get file size for " << db_path_.value();
   UMA_HISTOGRAM_MEMORY_KB("PredictorDatabase.DatabaseSizeKB",
                           static_cast<int>(db_size / 1024));
 
   autocomplete_table_->LogDatabaseStats();
+  resource_prefetch_tables_->LogDatabaseStats();
 }
 
-
 PredictorDatabase::PredictorDatabase(Profile* profile)
     : db_(new PredictorDatabaseInternal(profile)) {
   content::BrowserThread::PostTask(content::BrowserThread::DB, FROM_HERE,
       base::Bind(&PredictorDatabaseInternal::Initialize, db_));
 }
 
 PredictorDatabase::~PredictorDatabase() {
 }
 
 void PredictorDatabase::Shutdown() {
   db_->SetCancelled();
 }
 
 scoped_refptr<AutocompleteActionPredictorTable>
     PredictorDatabase::autocomplete_table() {
   return db_->autocomplete_table_;
 }
 
+scoped_refptr<ResourcePrefetchPredictorTables>
+    PredictorDatabase::resource_prefetch_tables() {
+  return db_->resource_prefetch_tables_;
+}
+
 sql::Connection* PredictorDatabase::GetDatabase() {
   return &db_->db_;
 }
 
 }  // namespace predictors