Refactor MetaTableHelper to remove redundant table name prefixing with databa...

chrome/browser/meta_table_helper.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_BROWSER_META_TABLE_HELPER_H__
 #define CHROME_BROWSER_META_TABLE_HELPER_H__
 
 #include <string>
 
 #include "base/basictypes.h"
 
 struct sqlite3;
 class SQLStatement;
 
 // MetaTableHelper maintains arbitrary key/value pairs in a table, as well
 // as version information. MetaTableHelper is used by both WebDatabase and
 // HistoryDatabase to maintain version information.
 //
 // To use a MetalTableHelper you must invoke the init method specifying the
 // database to use.
 class MetaTableHelper {
  public:
+  // Primes the sqlite cache by filling it with the file in sequence
+  // until there is no more data or the cache is full. Since this is one
+  // contiguous read operation, it is much faster than letting the pages come
+  // in on-demand (which causes lots of seeks).
+  static void PrimeCache(const std::string& db_name, sqlite3* db);
+
   // Creates a new MetaTableHelper. After construction you must invoke
   // Init with the appropriate database.
   MetaTableHelper();
   ~MetaTableHelper();
 
   // Initializes the MetaTableHelper, creating the meta table if necessary. For
   // new tables, it will initialize the version number to |version| and the
   // compatible version number to |compatible_version|.
   //
   // The name of the database in the sqlite connection (for tables named with
@@ skipping 29 matching lines @@
 
   // Arbitrary key/value pair with an int value.
   bool SetValue(const std::string& key, int value);
   bool GetValue(const std::string& key, int* value);
 
   // Arbitrary key/value pair with an int64 value.
   bool SetValue(const std::string& key, int64 value);
   bool GetValue(const std::string& key, int64* value);
 
  private:
+  friend class MetaTableHelperTest;

[M-A Ruel, 2009/07/01 10:59:34]

you could also use FRIEND_TEST() in gtest_prod.h. I don't mind

+
+  // Appends the meta table name to the SQL statement.
+  static void appendMetaTableName(const std::string& db_name, std::string* sql);
+
   // Conveniences to prepare the two types of statements used by
   // MetaTableHelper.
   bool PrepareSetStatement(SQLStatement* statement, const std::string& key);
   bool PrepareGetStatement(SQLStatement* statement, const std::string& key);
 
   sqlite3* db_;
 
   // Name of the database within the connection, if there is one. When empty,
   // there is no special database name.
   std::string db_name_;
 
   DISALLOW_EVIL_CONSTRUCTORS(MetaTableHelper);
 };
 
 #endif  // CHROME_BROWSER_META_TABLE_HELPER_H__