Updated user_settings.* to use Chromium's sqlite helper functions.

BUG=none
TEST=Run sync_unit_tests

Review URL: http://codereview.chromium.org/518026

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

1 files changed, 20 insertions, 29 deletions

diff --git a/chrome/browser/sync/util/user_settings_win.cc b/chrome/browser/sync/util/user_settings_win.cc
index 89c28fe..087fe6f 100644
--- a/chrome/browser/sync/util/user_settings_win.cc
+++ b/chrome/browser/sync/util/user_settings_win.cc
@@ -8,36 +8,26 @@
 
 #include "chrome/browser/sync/util/crypto_helpers.h"
 #include "chrome/browser/sync/util/data_encryption.h"
-#include "chrome/browser/sync/util/query_helpers.h"
+#include "chrome/common/sqlite_utils.h"
 
 using std::string;
 
 namespace browser_sync {
 
-bool UserSettings::GetLastUser(string* username) {
-  ScopedDBHandle dbhandle(this);
-  ScopedStatement query(PrepareQuery(dbhandle.get(),
-      "SELECT email FROM cookies"));
-  if (SQLITE_ROW == sqlite3_step(query.get())) {
-    GetColumn(query.get(), 0, username);
-    return true;
-  } else {
-    return false;
-  }
-}
-
-void UserSettings::ClearAllServiceTokens() {
-  ScopedDBHandle dbhandle(this);
-  ExecOrDie(dbhandle.get(), "DELETE FROM cookies");
-}
-
 void UserSettings::SetAuthTokenForService(const string& email,
     const string& service_name, const string& long_lived_service_token) {
   ScopedDBHandle dbhandle(this);
-  ExecOrDie(dbhandle.get(), "INSERT INTO cookies "
-            "(email, service_name, service_token) "
-            "values (?, ?, ?)", email, service_name,
-            EncryptData(long_lived_service_token));
+  SQLStatement statement;
+  statement.prepare(dbhandle.get(),
+                    "INSERT INTO cookies "
+                    "(email, service_name, service_token) "
+                    "values (?, ?, ?)");
+  statement.bind_string(0, email);
+  statement.bind_string(1, service_name);
+  statement.bind_blob(2, &EncryptData(long_lived_service_token));
+  if (SQLITE_DONE != statement.step()) {
+    LOG(FATAL) << sqlite3_errmsg(dbhandle.get());
+  }
 }
 
 // Returns the username whose credentials have been persisted as well as
@@ -46,16 +36,17 @@ bool UserSettings::GetLastUserAndServiceToken(const string& service_name,
                                               string* username,
                                               string* service_token) {
   ScopedDBHandle dbhandle(this);
-  ScopedStatement query(PrepareQuery(
-      dbhandle.get(),
-      "SELECT email, service_token FROM cookies WHERE service_name = ?",
-      service_name));
+  SQLStatement query;
+  query.prepare(dbhandle.get(),
+                "SELECT email, service_token FROM cookies"
+                " WHERE service_name = ?");
+  query.bind_string(0, service_name.c_str());
 
-  if (SQLITE_ROW == sqlite3_step(query.get())) {
-    GetColumn(query.get(), 0, username);
+  if (SQLITE_ROW == query.step()) {
+    *username = query.column_string(0);
 
     std::vector<uint8> encrypted_service_token;
-    GetColumn(query.get(), 1, &encrypted_service_token);
+    query.column_blob_as_vector(1, &encrypted_service_token);
     DecryptData(encrypted_service_token, service_token);
     return true;
   }