Move creation of the various WebDatabaseTable types out of WebDatabase.

chrome/browser/webdata/web_intents_table.cc

 // 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.
 
 #include "chrome/browser/webdata/web_intents_table.h"
 #include <string>
 
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mime_util.h"
 #include "sql/statement.h"
 #include "third_party/sqlite/sqlite3.h"
 
-WebIntentsTable::WebIntentsTable(sql::Connection* db,
-                                 sql::MetaTable* meta_table)
-    : WebDatabaseTable(db, meta_table) {
+namespace {
+
+WebDatabaseTable::TypeKey GetKey() {
+  return reinterpret_cast<void*>(&WebIntentsTable::FromWebDatabase);
+}
+
+}  // namespace
+
+WebIntentsTable::WebIntentsTable() {
 }
 
 WebIntentsTable::~WebIntentsTable() {
 }
 
-bool WebIntentsTable::Init() {
+WebIntentsTable* WebIntentsTable::FromWebDatabase(WebDatabase* db) {
+  return static_cast<WebIntentsTable*>(db->GetTable(GetKey()));
+}
+
+WebDatabaseTable::TypeKey WebIntentsTable::GetTypeKey() const {
+  return GetKey();
+}
+
+bool WebIntentsTable::Init(sql::Connection* db, sql::MetaTable* meta_table) {
+  WebDatabaseTable::Init(db, meta_table);
+
   if (!db_->DoesTableExist("web_intents")) {
     if (!db_->Execute("CREATE TABLE web_intents ("
                       " service_url LONGVARCHAR,"
                       " action VARCHAR,"
                       " type VARCHAR,"
                       " title LONGVARCHAR,"
                       " disposition VARCHAR,"
                       " scheme VARCHAR,"
                       " UNIQUE (service_url, action, scheme, type))")) {
       return false;
@@ skipping 54 matching lines @@
     DLOG(WARNING) << "Could not backup web_intents table.";
     return false;
   }
 
   if (!db_->Execute("ALTER TABLE web_intents_defaults"
                     " RENAME TO old_web_intents_defaults")) {
     DLOG(WARNING) << "Could not backup web_intents_defaults table.";
     return false;
   }
 
-  if (!Init()) return false;
+  if (!Init(db_, meta_table_)) return false;
 
   int error = db_->ExecuteAndReturnErrorCode(
       "INSERT INTO web_intents"
       " (service_url, action, type, title, disposition)"
       " SELECT "
       " service_url, action, type, title, disposition"
       " FROM old_web_intents");
 
   if (error != SQLITE_OK) {
     DLOG(WARNING) << "Could not copy old intent data to upgraded table."
@@ skipping 18 matching lines @@
     return false;
   }
 
   if (!db_->Execute("DROP table old_web_intents_defaults")) {
     DLOG(WARNING) << "Could not drop backup web_intents_defaults table.";
     return false;
   }
 
   return true;
 }