Move creation of the various WebDatabaseTable types out of WebDatabase.

chrome/browser/webdata/web_apps_table.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/webdata/web_apps_table.h"
 
 #include "base/logging.h"
 #include "chrome/browser/history/history_database.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "googleurl/src/gurl.h"
 #include "sql/statement.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/png_codec.h"
 
-bool WebAppsTable::Init() {
+namespace {
+
+WebDatabaseTable::TypeKey GetKey() {
+  return reinterpret_cast<void*>(&WebAppsTable::FromWebDatabase);
+}
+
+}  // namespace
+
+WebAppsTable* WebAppsTable::FromWebDatabase(WebDatabase* db) {
+  return static_cast<WebAppsTable*>(db->GetTable(GetKey()));
+}
+
+WebDatabaseTable::TypeKey WebAppsTable::GetTypeKey() const {
+  return GetKey();
+}
+
+bool WebAppsTable::Init(sql::Connection* db, sql::MetaTable* meta_table) {
+  WebDatabaseTable::Init(db, meta_table);
+
   return (InitWebAppIconsTable() && InitWebAppsTable());
 }
 
 bool WebAppsTable::IsSyncable() {
   return true;
 }
 
 bool WebAppsTable::MigrateToVersion(int version,
                                     const std::string& app_locale,
                                     bool* update_compatible_version) {
@@ skipping 94 matching lines @@
 
   if (!delete_s.Run())
     return false;
 
   sql::Statement delete_s2(db_->GetUniqueStatement(
       "DELETE FROM web_apps WHERE url = ?"));
   delete_s2.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
 
   return delete_s2.Run();
 }