More SQL statement usage regularization. Back-touch some

chrome/browser/autocomplete/network_action_predictor_database.cc

 // Copyright (c) 2011 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/autocomplete/network_action_predictor_database.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
@@ skipping 39 matching lines @@
 void LogDatabaseStats(const FilePath& db_path, sql::Connection* 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("NetworkActionPredictor.DatabaseSizeKB",
                           static_cast<int>(db_size / 1024));
 
   sql::Statement count_statement(db->GetUniqueStatement(
       base::StringPrintf("SELECT count(id) FROM %s",
                          kNetworkActionPredictorTableName).c_str()));
-  if (!count_statement || !count_statement.Step())
+  if (!count_statement.Step())
     return;
   UMA_HISTOGRAM_COUNTS("NetworkActionPredictor.DatabaseRowCount",
                        count_statement.ColumnInt(0));
 }
 
 }
 
 NetworkActionPredictorDatabase::Row::Row()
     : number_of_hits(0),
       number_of_misses(0) {
@@ skipping 39 matching lines @@
 void NetworkActionPredictorDatabase::GetRow(const Row::Id& id, Row* row) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       base::StringPrintf(
           "SELECT * FROM %s WHERE id=?",
           kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
-
   statement.BindString(0, id);
 
   bool success = StepAndInitializeRow(&statement, row);
   DCHECK(success) << "Failed to get row " << id << " from "
                   << kNetworkActionPredictorTableName;
 }
 
 void NetworkActionPredictorDatabase::GetAllRows(
     std::vector<NetworkActionPredictorDatabase::Row>* row_buffer) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
   CHECK(row_buffer);
   row_buffer->clear();
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       base::StringPrintf(
           "SELECT * FROM %s", kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
 
   Row row;
   while (StepAndInitializeRow(&statement, &row))
     row_buffer->push_back(row);
 }
 
 void NetworkActionPredictorDatabase::AddRow(
     const NetworkActionPredictorDatabase::Row& row) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       base::StringPrintf(
           "INSERT INTO %s "
           "(id, user_text, url, number_of_hits, number_of_misses) "
           "VALUES (?,?,?,?,?)", kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
-
   BindRowToStatement(row, &statement);
 
   bool success = statement.Run();
   DCHECK(success) << "Failed to insert row " << row.id << " into "
                   << kNetworkActionPredictorTableName;
 }
 
 void NetworkActionPredictorDatabase::UpdateRow(
     const NetworkActionPredictorDatabase::Row& row) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       base::StringPrintf(
           "UPDATE %s "
           "SET id=?, user_text=?, url=?, number_of_hits=?, number_of_misses=? "
           "WHERE id=?1", kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
-
   BindRowToStatement(row, &statement);
 
   statement.Run();
   DCHECK_GT(db_.GetLastChangeCount(), 0);
 }
 
 void NetworkActionPredictorDatabase::DeleteRow(const Row::Id& id) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   DeleteRows(std::vector<Row::Id>(1, id));
 }
 
 void NetworkActionPredictorDatabase::DeleteRows(
     const std::vector<Row::Id>& id_list) {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetUniqueStatement(base::StringPrintf(
           "DELETE FROM %s WHERE id=?",
           kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
 
   db_.BeginTransaction();
   for (std::vector<Row::Id>::const_iterator it = id_list.begin();
        it != id_list.end(); ++it) {
     statement.BindString(0, *it);
     statement.Run();
     statement.Reset();
   }
   db_.CommitTransaction();
 }
 
 void NetworkActionPredictorDatabase::DeleteAllRows() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
   sql::Statement statement(db_.GetCachedStatement(SQL_FROM_HERE,
       base::StringPrintf("DELETE FROM %s",
                          kNetworkActionPredictorTableName).c_str()));
-  DCHECK(statement);
 
   statement.Run();
 }
 
 void NetworkActionPredictorDatabase::BeginTransaction() {
   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::DB));
 
   if (canceled_.IsSet())
     return;
 
@@ skipping 17 matching lines @@
   bool success = db_.Execute(base::StringPrintf(
       "CREATE TABLE %s ( "
       "id TEXT PRIMARY KEY, "
       "user_text TEXT, "
       "url TEXT, "
       "number_of_hits INTEGER, "
       "number_of_misses INTEGER)", kNetworkActionPredictorTableName).c_str());
   DCHECK(success) << "Failed to create " << kNetworkActionPredictorTableName
                   << " table.";
 }