Move creation of the various WebDatabaseTable types out of WebDatabase.

chrome/browser/webdata/keyword_table.h

 // Copyright (c) 2012 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_WEBDATA_KEYWORD_TABLE_H_
 #define CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
 #include "chrome/browser/webdata/web_database_table.h"
 #include "chrome/browser/search_engines/template_url_id.h"
 
 struct TemplateURLData;
+class WebDatabase;
 
 namespace sql {
 class Statement;
 }  // namespace sql
 
 // This class manages the |keywords| MetaTable within the SQLite database
 // passed to the constructor. It expects the following schema:
 //
 // Note: The database stores time in seconds, UTC.
 //
@@ skipping 36 matching lines @@
 // Builtin Keyword Version           The version of builtin keywords data.
 //
 class KeywordTable : public WebDatabaseTable {
  public:
   typedef std::vector<TemplateURLData> Keywords;
 
   // Constants exposed for the benefit of test code:
 
   static const char kDefaultSearchProviderKey[];
 
-  KeywordTable(sql::Connection* db, sql::MetaTable* meta_table);
+  KeywordTable();
   virtual ~KeywordTable();
-  virtual bool Init() OVERRIDE;
+
+  // Retrieves the KeywordTable* owned by |database|.
+  static KeywordTable* FromWebDatabase(WebDatabase* db);
+
+  virtual WebDatabaseTable::TypeKey GetTypeKey() const OVERRIDE;
+  virtual bool Init(sql::Connection* db, sql::MetaTable* meta_table) OVERRIDE;
   virtual bool IsSyncable() OVERRIDE;
   virtual bool MigrateToVersion(int version,
                                 const std::string& app_locale,
                                 bool* update_compatible_version) OVERRIDE;
 
   // Adds a new keyword, updating the id field on success.
   // Returns true if successful.
   bool AddKeyword(const TemplateURLData& data);
 
   // Removes the specified keyword.
@@ skipping 65 matching lines @@
                           std::string* result);
 
   // Migrates table |name| (which should be either "keywords" or
   // "keywords_backup") from version 44 to version 45.
   bool MigrateKeywordsTableForVersion45(const std::string& name);
 
   DISALLOW_COPY_AND_ASSIGN(KeywordTable);
 };
 
 #endif  // CHROME_BROWSER_WEBDATA_KEYWORD_TABLE_H_