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

chrome/browser/password_manager/login_database.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 CHROME_BROWSER_PASSWORD_MANAGER_LOGIN_DATABASE_H_
 #define CHROME_BROWSER_PASSWORD_MANAGER_LOGIN_DATABASE_H_
 
 #include <string>
 #include <vector>
 
+#include "app/sql/connection.h"
+#include "app/sql/meta_table.h"
 #include "base/string16.h"
-#include "chrome/browser/meta_table_helper.h"
 #include "webkit/glue/password_form.h"
 
 class FilePath;
 struct sqlite3;
 
 // Interface to the database storage of login information, intended as a helper
 // for PasswordStore on platforms that need internal storage of some or all of
 // the login information.
 class LoginDatabase {
  public:
@@ skipping 33 matching lines @@
       const base::Time begin,
       const base::Time end,
       std::vector<webkit_glue::PasswordForm*>* forms) const;
 
   // Loads the complete list of autofillable password forms (i.e., not blacklist
   // entries) into |forms|.
   bool GetAutofillableLogins(
       std::vector<webkit_glue::PasswordForm*>* forms) const;
 
   // Loads the complete list of blacklist forms into |forms|.
-  bool GetBlacklistLogins(
-      std::vector<webkit_glue::PasswordForm*>* forms) const;
+  bool GetBlacklistLogins(std::vector<webkit_glue::PasswordForm*>* forms) const;
 
  private:
   // Returns an encrypted version of plain_text.
   std::string EncryptedString(const string16& plain_text) const;
 
   // Returns a decrypted version of cipher_text.
   string16 DecryptedString(const std::string& cipher_text) const;
 
   bool InitLoginsTable();
   void MigrateOldVersionsAsNeeded();
 
   // Fills |form| from the values in the given statement (which is assumed to
   // be of the form used by the Get*Logins methods).
   void InitPasswordFormFromStatement(webkit_glue::PasswordForm* form,
-                                     SQLStatement* s) const;
+                                     sql::Statement& s) const;
 
   // Loads all logins whose blacklist setting matches |blacklisted| into
   // |forms|.
   bool GetAllLoginsWithBlacklistSetting(
       bool blacklisted, std::vector<webkit_glue::PasswordForm*>* forms) const;
 
-  sqlite3* db_;
-  MetaTableHelper meta_table_;
+  mutable sql::Connection db_;
+  sql::MetaTable meta_table_;
 
   DISALLOW_COPY_AND_ASSIGN(LoginDatabase);
 };
 
 
 #endif  // CHROME_BROWSER_PASSWORD_MANAGER_LOGIN_DATABASE_H_