Move creation of the various WebDatabaseTable types out of WebDatabase.

chrome/browser/webdata/token_service_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/token_service_table.h"
 
 #include <map>
 #include <string>
 
 #include "base/logging.h"
 #include "chrome/browser/password_manager/encryptor.h"
+#include "chrome/browser/webdata/web_database.h"
 #include "sql/statement.h"
 
-bool TokenServiceTable::Init() {
+namespace {
+
+int table_key = 0;
+
+WebDatabaseTable::TypeKey GetKey() {
+  return reinterpret_cast<void*>(&table_key);
+}
+
+}  // namespace
+
+TokenServiceTable* TokenServiceTable::FromWebDatabase(WebDatabase* db) {
+  return static_cast<TokenServiceTable*>(db->GetTable(GetKey()));
+
+}
+
+WebDatabaseTable::TypeKey TokenServiceTable::GetTypeKey() const {
+  return GetKey();
+}
+
+bool TokenServiceTable::Init(sql::Connection* db, sql::MetaTable* meta_table) {
+  WebDatabaseTable::Init(db, meta_table);
   if (!db_->DoesTableExist("token_service")) {
     if (!db_->Execute("CREATE TABLE token_service ("
                       "service VARCHAR PRIMARY KEY NOT NULL,"
                       "encrypted_token BLOB)")) {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }
@@ skipping 53 matching lines @@
     if (entry_ok) {
       Encryptor::DecryptString(encrypted_token, &decrypted_token);
       (*tokens)[service] = decrypted_token;
     } else {
       NOTREACHED();
       return false;
     }
   }
   return true;
 }