Revert 251442 "Migrate old Shortcuts DB data to conform to new t..."

trunk/src/chrome/browser/history/shortcuts_database.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/history/shortcuts_database.h"
 
 #include <string>
 #include <vector>
 
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
-#include "sql/meta_table.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 namespace {
 
-// Current version number. We write databases at the "current" version number,
-// but any previous version that can read the "compatible" one can make do with
-// our database without *too* many bad effects.
-const int kCurrentVersionNumber = 1;
-const int kCompatibleVersionNumber = 1;
-
 void BindShortcutToStatement(
     const history::ShortcutsBackend::Shortcut& shortcut,
     sql::Statement* s) {
   DCHECK(base::IsValidGUID(shortcut.id));
   s->BindString(0, shortcut.id);
   s->BindString16(1, shortcut.text);
   s->BindString16(2, shortcut.match_core.fill_into_edit);
   s->BindString(3, shortcut.match_core.destination_url.spec());
   s->BindString16(4, shortcut.match_core.contents);
   s->BindString(5, AutocompleteMatch::ClassificationsToString(
@@ skipping 141 matching lines @@
             "keyword VARCHAR, last_access_time INTEGER, "
             "number_of_hits INTEGER)");
   }
 
   // The first version of the shortcuts table lacked the fill_into_edit,
   // transition, type, and keyword columns.
   if (!db_.DoesColumnExist("omni_box_shortcuts", "fill_into_edit")) {
     // Perform the upgrade in a transaction to ensure it doesn't happen
     // incompletely.
     sql::Transaction transaction(&db_);
-    if (!(transaction.Begin() &&
+    transaction.Begin();
+    return
         db_.Execute("ALTER TABLE omni_box_shortcuts "
             "ADD COLUMN fill_into_edit VARCHAR") &&
         db_.Execute("UPDATE omni_box_shortcuts SET fill_into_edit = url") &&
         db_.Execute("ALTER TABLE omni_box_shortcuts "
             "ADD COLUMN transition INTEGER") &&
         db_.Execute(base::StringPrintf(
             "UPDATE omni_box_shortcuts SET transition = %d",
             static_cast<int>(content::PAGE_TRANSITION_TYPED)).c_str()) &&
         db_.Execute("ALTER TABLE omni_box_shortcuts ADD COLUMN type INTEGER") &&
         db_.Execute(base::StringPrintf(
             "UPDATE omni_box_shortcuts SET type = %d",
             static_cast<int>(AutocompleteMatchType::HISTORY_TITLE)).c_str()) &&
         db_.Execute("ALTER TABLE omni_box_shortcuts "
             "ADD COLUMN keyword VARCHAR") &&
-        transaction.Commit())) {
-      return false;
-    }
+        transaction.Commit();
   }
 
-  if (!sql::MetaTable::DoesTableExist(&db_)) {
-    meta_table_.Init(&db_, kCurrentVersionNumber, kCompatibleVersionNumber);
-    sql::Transaction transaction(&db_);
-    if (!(transaction.Begin() &&
-      // Migrate old SEARCH_OTHER_ENGINE values to the new type value.
-      db_.Execute(base::StringPrintf("UPDATE omni_box_shortcuts "
-          "SET type = 13 WHERE type = 9").c_str()) &&
-      // Migrate old EXTENSION_APP values to the new type value.
-      db_.Execute(base::StringPrintf("UPDATE omni_box_shortcuts "
-           "SET type = 14 WHERE type = 10").c_str()) &&
-      // Migrate old CONTACT values to the new type value.
-      db_.Execute(base::StringPrintf("UPDATE omni_box_shortcuts "
-           "SET type = 15 WHERE type = 11").c_str()) &&
-      // Migrate old BOOKMARK_TITLE values to the new type value.
-      db_.Execute(base::StringPrintf("UPDATE omni_box_shortcuts "
-           "SET type = 16 WHERE type = 12").c_str()) &&
-      transaction.Commit())) {
-      return false;
-    }
-  }
   return true;
 }
 
 }  // namespace history