Get rid of MetaTableHelper class and make use of the app/sql API in the LoginDatabase.

app/sql/statement.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "app/sql/statement.h"
 
 #include "base/logging.h"
+#include "base/utf_string_conversions.h"
 #include "third_party/sqlite/preprocessed/sqlite3.h"
 
 namespace sql {
 
 // This empty constructor initializes our reference with an empty one so that
 // we don't have to NULL-check the ref_ to see if the statement is valid: we
 // only have to check the ref's validity bit.
 Statement::Statement()
     : ref_(new Connection::StatementRef),
       succeeded_(false) {
@@ skipping 92 matching lines @@
 
 bool Statement::BindString(int col, const std::string& val) {
   if (is_valid()) {
     int err = CheckError(sqlite3_bind_text(ref_->stmt(), col + 1, val.data(),
                                            val.size(), SQLITE_TRANSIENT));
     return err == SQLITE_OK;
   }
   return false;
 }
 
+bool Statement::BindString16(int col, const string16& value) {
+    return BindString(col, UTF16ToUTF8(value));
+}
+
 bool Statement::BindBlob(int col, const void* val, int val_len) {
   if (is_valid()) {
     int err = CheckError(sqlite3_bind_blob(ref_->stmt(), col + 1,
                          val, val_len, SQLITE_TRANSIENT));
     return err == SQLITE_OK;
   }
   return false;
 }
 
 int Statement::ColumnCount() const {
@@ skipping 51 matching lines @@
   const char* str = reinterpret_cast<const char*>(
       sqlite3_column_text(ref_->stmt(), col));
   int len = sqlite3_column_bytes(ref_->stmt(), col);
 
   std::string result;
   if (str && len > 0)
     result.assign(str, len);
   return result;
 }
 
+string16 Statement::ColumnString16(int col) const {
+  if (!is_valid()) {
+    NOTREACHED();
+    return string16();
+  }
+  std::string s = ColumnString(col);
+  return !s.empty() ? UTF8ToUTF16(s) : string16();
+}
+
 int Statement::ColumnByteLength(int col) const {
   if (!is_valid()) {
     NOTREACHED();
     return 0;
   }
   return sqlite3_column_bytes(ref_->stmt(), col);
 }
 
 const void* Statement::ColumnBlob(int col) const {
   if (!is_valid()) {
     NOTREACHED();
     return NULL;
   }
 
   return sqlite3_column_blob(ref_->stmt(), col);
 }
 
+bool Statement::ColumnBlobAsString(int col, std::string* blob) {
+  if (!is_valid()) {
+    NOTREACHED();
+    return false;
+  }
+  const void* p = ColumnBlob(col);
+  size_t len = ColumnByteLength(col);
+  blob->resize(len);
+  if (blob->size() != len) {
+    return false;
+  }
+  blob->assign(reinterpret_cast<const char*>(p), len);
+  return true;
+}
+
 void Statement::ColumnBlobAsVector(int col, std::vector<char>* val) const {
   val->clear();
   if (!is_valid()) {
     NOTREACHED();
     return;
   }
 
   const void* data = sqlite3_column_blob(ref_->stmt(), col);
   int len = sqlite3_column_bytes(ref_->stmt(), col);
   if (data && len > 0) {
@@ skipping 14 matching lines @@
 
 int Statement::CheckError(int err) {
   // Please don't add DCHECKs here, OnSqliteError() already has them.
   succeeded_ = (err == SQLITE_OK || err == SQLITE_ROW || err == SQLITE_DONE);
   if (!succeeded_ && is_valid())
     return ref_->connection()->OnSqliteError(err, this);
   return err;
 }
 
 }  // namespace sql