Porting changes in chrome/{browser,common}, also enabling more unit tests....

chrome/common/sqlite_utils.h

 // Copyright (c) 2006-2008 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_COMMON_SQLITEUTILS_H_
 #define CHROME_COMMON_SQLITEUTILS_H_
 
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 
 #include "third_party/sqlite/sqlite3.h"
 
 // forward declarations of classes defined here
 class SQLTransaction;
 class SQLNestedTransaction;
 class SQLNestedTransactionSite;
@@ skipping 39 matching lines @@
   }
 
   bool HasBegun() {
     return began_;
   }
 
  protected:
   virtual int BeginCommand(const char* command);
   virtual int EndCommand(const char* command);
 
+  sqlite3* db_;
   bool began_;
-  sqlite3* db_;
   DISALLOW_COPY_AND_ASSIGN(SQLTransaction);
 };
 
 
 //------------------------------------------------------------------------------
 // A class for use with SQLNestedTransaction.
 //------------------------------------------------------------------------------
 class SQLNestedTransactionSite {
  protected:
   SQLNestedTransactionSite() : db_(NULL), top_transaction_(NULL) {}
@@ skipping 260 matching lines @@
                            const char* column_type) {
   return DoesSqliteColumnExist(db, NULL, table_name, column_name, column_type);
 }
 
 // Test whether a table has one or more rows. Returns true if the table
 // has one or more rows and false if the table is empty or doesn't exist.
 bool DoesSqliteTableHaveRow(sqlite3* db, const char* table_name);
 
 #endif  // CHROME_COMMON_SQLITEUTILS_H_