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

app/sql/statement.h

-// 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.
 
 #ifndef APP_SQL_STATEMENT_H_
 #define APP_SQL_STATEMENT_H_
 
 #include <string>
 #include <vector>
 
 #include "app/sql/connection.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
+#include "base/string16.h"
 
 namespace sql {
 
 // Possible return values from ColumnType in a statement. These should match
 // the values in sqlite3.h.
 enum ColType {
   COLUMN_TYPE_INTEGER = 1,
   COLUMN_TYPE_FLOAT = 2,
   COLUMN_TYPE_TEXT = 3,
   COLUMN_TYPE_BLOB = 4,
@@ skipping 73 matching lines @@
   // may not always care about the return value (they'll DCHECK if they fail).
   // The main thing you may want to check is when binding large blobs or
   // strings there may be out of memory.
   bool BindNull(int col);
   bool BindBool(int col, bool val);
   bool BindInt(int col, int val);
   bool BindInt64(int col, int64 val);
   bool BindDouble(int col, double val);
   bool BindCString(int col, const char* val);
   bool BindString(int col, const std::string& val);
+  bool BindString16(int col, const string16& value);
   bool BindBlob(int col, const void* value, int value_len);
 
   // Retrieving ----------------------------------------------------------------
 
   // Returns the number of output columns in the result.
   int ColumnCount() const;
 
   // Returns the type associated with the given column.
   //
   // Watch out: the type may be undefined if you've done something to cause a
   // "type conversion." This means requesting the value of a column of a type
   // where that type is not the native type. For safety, call ColumnType only
   // on a column before getting the value out in any way.
   ColType ColumnType(int col) const;
 
   // These all take a 0-based argument index.
   bool ColumnBool(int col) const;
   int ColumnInt(int col) const;
   int64 ColumnInt64(int col) const;
   double ColumnDouble(int col) const;
   std::string ColumnString(int col) const;
+  string16 ColumnString16(int col) const;
 
   // When reading a blob, you can get a raw pointer to the underlying data,
   // along with the length, or you can just ask us to copy the blob into a
   // vector. Danger! ColumnBlob may return NULL if there is no data!
   int ColumnByteLength(int col) const;
   const void* ColumnBlob(int col) const;
+  bool ColumnBlobAsString(int col, std::string* blob);
   void ColumnBlobAsVector(int col, std::vector<char>* val) const;
   void ColumnBlobAsVector(int col, std::vector<unsigned char>* val) const;
 
   // Diagnostics --------------------------------------------------------------
 
   // Returns the original text of sql statement. Do not keep a pointer to it.
   const char* GetSQLStatement();
 
  private:
   // This is intended to check for serious errors and report them to the
   // connection object. It takes a sqlite error code, and returns the same
   // code. Currently this function just updates the succeeded flag, but will be
   // enhanced in the future to do the notification.
   int CheckError(int err);
 
   // The actual sqlite statement. This may be unique to us, or it may be cached
   // by the connection, which is why it's refcounted. This pointer is
   // guaranteed non-NULL.
   scoped_refptr<Connection::StatementRef> ref_;
 
   // See Succeeded() for what this holds.
   bool succeeded_;
 
   DISALLOW_COPY_AND_ASSIGN(Statement);
 };
 
 }  // namespace sql
 
 #endif  // APP_SQL_STATEMENT_H_