Convert the sqlite cookie database and web database to use the new sqlite

wrapper. This also moves and renamed the old cookie_monster_sqlite file to
match the class name.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/201099

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26260 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 30 insertions, 33 deletions

diff --git a/chrome/browser/webdata/web_database_win.cc b/chrome/browser/webdata/web_database_win.cc
index 4bfcc02..9ffbf9b 100644
--- a/chrome/browser/webdata/web_database_win.cc
+++ b/chrome/browser/webdata/web_database_win.cc
@@ -1,29 +1,30 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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/webdata/web_database.h"
 
+#include "app/sql/statement.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/browser/password_manager/ie7_password.h"
-#include "chrome/common/sqlite_utils.h"
 
 bool WebDatabase::AddIE7Login(const IE7PasswordInfo& info) {
-  SQLStatement s;
-  if (s.prepare(db_,
-                "INSERT OR REPLACE INTO ie7_logins "
-                "(url_hash, password_value, date_created) "
-                "VALUES (?, ?, ?)") != SQLITE_OK) {
-    NOTREACHED() << "Statement prepare failed";
+  sql::Statement s(db_.GetUniqueStatement(
+      "INSERT OR REPLACE INTO ie7_logins "
+      "(url_hash, password_value, date_created) "
+      "VALUES (?,?,?)"));
+  if (!s) {
+    NOTREACHED() << db_.GetErrorMessage();
     return false;
   }
 
-  s.bind_wstring(0, info.url_hash);
-  s.bind_blob(1, &info.encrypted_data.front(),
-              static_cast<int>(info.encrypted_data.size()));
-  s.bind_int64(2, info.date_created.ToTimeT());
-  if (s.step() != SQLITE_DONE) {
+  s.BindString(0, WideToUTF8(info.url_hash));
+  s.BindBlob(1, &info.encrypted_data.front(),
+             static_cast<int>(info.encrypted_data.size()));
+  s.BindInt64(2, info.date_created.ToTimeT());
+  if (!s.Run()) {
     NOTREACHED();
     return false;
   }
@@ -31,17 +32,16 @@ bool WebDatabase::AddIE7Login(const IE7PasswordInfo& info) {
 }
 
 bool WebDatabase::RemoveIE7Login(const IE7PasswordInfo& info) {
-  SQLStatement s;
   // Remove a login by UNIQUE-constrained fields.
-  if (s.prepare(db_,
-                "DELETE FROM ie7_logins WHERE "
-                "url_hash = ?") != SQLITE_OK) {
-    NOTREACHED() << "Statement prepare failed";
+  sql::Statement s(db_.GetUniqueStatement(
+      "DELETE FROM ie7_logins WHERE url_hash = ?"));
+  if (!s) {
+    NOTREACHED() << db_.GetErrorMessage();
     return false;
   }
-  s.bind_wstring(0, info.url_hash);
+  s.BindString(0, WideToUTF8(info.url_hash));
 
-  if (s.step() != SQLITE_DONE) {
+  if (!s.Run()) {
     NOTREACHED();
     return false;
   }
@@ -51,22 +51,19 @@ bool WebDatabase::RemoveIE7Login(const IE7PasswordInfo& info) {
 bool WebDatabase::GetIE7Login(const IE7PasswordInfo& info,
                               IE7PasswordInfo* result) {
   DCHECK(result);
-  SQLStatement s;
-  if (s.prepare(db_,
-                "SELECT password_value, date_created FROM ie7_logins "
-                "WHERE url_hash == ? ") != SQLITE_OK) {
-    NOTREACHED() << "Statement prepare failed";
+  sql::Statement s(db_.GetUniqueStatement(
+      "SELECT password_value, date_created FROM ie7_logins "
+      "WHERE url_hash == ? "));
+  if (!s) {
+    NOTREACHED() << db_.GetErrorMessage();
     return false;
   }
 
-  s.bind_wstring(0, info.url_hash);
-
-  int64 query_result = s.step();
-  if (query_result == SQLITE_ROW) {
-    s.column_blob_as_vector(0, &result->encrypted_data);
-    result->date_created = base::Time::FromTimeT(s.column_int64(1));
+  s.BindString(0, WideToUTF8(info.url_hash));
+  if (s.Step()) {
+    s.ColumnBlobAsVector(0, &result->encrypted_data);
+    result->date_created = base::Time::FromTimeT(s.ColumnInt64(1));
     result->url_hash = info.url_hash;
-    s.step();
   }
-  return query_result == SQLITE_DONE;
+  return s.Succeeded();
 }