Create new Autofill tables as part of DB migration.

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"
@@ skipping 23 matching lines @@
 }
 
 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);
-
+bool WebIntentsTable::CreateTablesIfNecessary() {
   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 41 matching lines @@
     *update_compatible_version = true;
     return MigrateToVersion46AddSchemeColumn();
   }
 
   return true;
 }
 
 // Updates the table by way of renaming the old tables, rerunning
 // the Init method, then selecting old values into the new tables.
 bool WebIntentsTable::MigrateToVersion46AddSchemeColumn() {
+  // If the old table doesn't exist, there's nothing to migrate.
+  if (!db_->DoesTableExist("web_intents"))
+    return true;
 
-  if (!db_->Execute("ALTER TABLE web_intents RENAME TO old_web_intents")) {
-    DLOG(WARNING) << "Could not backup web_intents table.";
+  if (!db_->Execute("ALTER TABLE web_intents RENAME TO old_web_intents"))
     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.";
+                    " RENAME TO old_web_intents_defaults"))
     return false;
-  }
 
-  if (!Init(db_, meta_table_)) return false;
+  if (!CreateTablesIfNecessary())
+    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;
 }