Database usage adjustment for .../history

chrome/browser/history/shortcuts_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/history/shortcuts_database.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 47 matching lines @@
                                       s.ColumnString16(6),
                                       s.ColumnInt64(7),
                                       s.ColumnInt(8));
 }
 
 bool DeleteShortcut(const char* field_name, const std::string& id,
                     sql::Connection& db) {
   sql::Statement s(db.GetUniqueStatement(
       base::StringPrintf("DELETE FROM %s WHERE %s = ?", kShortcutsDBName,
                          field_name).c_str()));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
+  s.BindString(0, id);
 
-  s.BindString(0, id);
-  if (!s.Run())
-    return false;
-  return true;
+  return s.Run();
 }
 
 }  // namespace
 
 namespace history {
 
 const FilePath::CharType ShortcutsDatabase::kShortcutsDatabaseName[] =
     FILE_PATH_LITERAL("Shortcuts");
 
 ShortcutsDatabase::ShortcutsDatabase(const FilePath& folder_path)
@@ skipping 22 matching lines @@
   return true;
 }
 
 bool ShortcutsDatabase::AddShortcut(
     const shortcuts_provider::Shortcut& shortcut) {
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "INSERT INTO " kShortcutsDBName
       " (id, text, url, contents, contents_class, description,"
       " description_class, last_access_time, number_of_hits) "
       "VALUES (?,?,?,?,?,?,?,?,?)"));
-  if (!s) {
-    NOTREACHED();
-    return false;
-  }
   BindShortcutToStatement(shortcut, &s);
 
-  if (!s.Run()) {
-    NOTREACHED();
-    return false;
-  }
-  return true;
+  return s.Run();
 }
 
 bool ShortcutsDatabase::UpdateShortcut(
     const shortcuts_provider::Shortcut& shortcut) {
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
     "UPDATE " kShortcutsDBName " "
       "SET id=?, text=?, url=?, contents=?, contents_class=?,"
       "     description=?, description_class=?, last_access_time=?,"
       "     number_of_hits=? "
       "WHERE id=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
-
   BindShortcutToStatement(shortcut, &s);
   s.BindString(9, shortcut.id);
+
   bool result = s.Run();
   DCHECK_GT(db_.GetLastChangeCount(), 0);
   return result;
 }
 
 bool ShortcutsDatabase::DeleteShortcutsWithIds(
     const std::vector<std::string>& shortcut_ids) {
   bool success = true;
   db_.BeginTransaction();
   for (std::vector<std::string>::const_iterator it = shortcut_ids.begin();
@@ skipping 19 matching lines @@
 }
 
 // Loads all of the shortcuts.
 bool ShortcutsDatabase::LoadShortcuts(
     std::map<std::string, shortcuts_provider::Shortcut>* shortcuts) {
   DCHECK(shortcuts);
   sql::Statement s(db_.GetCachedStatement(SQL_FROM_HERE,
       "SELECT id, text, url, contents, contents_class, "
       "description, description_class, last_access_time, number_of_hits "
       "FROM " kShortcutsDBName));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
+
+  if (!s.is_valid())
     return false;
-  }
+
   shortcuts->clear();
   while (s.Step()) {
     shortcuts->insert(std::make_pair(s.ColumnString(0),
                                      ShortcutFromStatement(s)));
   }
   return true;
 }
 
 bool ShortcutsDatabase::EnsureTable() {
   if (!db_.DoesTableExist(kShortcutsDBName)) {
     if (!db_.Execute(base::StringPrintf(
                      "CREATE TABLE %s ( "
                      "id VARCHAR PRIMARY KEY, "
                      "text VARCHAR, "
                      "url VARCHAR, "
                      "contents VARCHAR, "
                      "contents_class VARCHAR, "
                      "description VARCHAR, "
                      "description_class VARCHAR, "
                      "last_access_time INTEGER, "
                      "number_of_hits INTEGER)", kShortcutsDBName).c_str())) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
 
 }  // namespace history