Remove the protector service.

chrome/browser/webdata/web_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/webdata/web_database.h"
 
 #include <algorithm>
 
 #include "chrome/browser/diagnostics/sqlite_diagnostics.h"
 #include "chrome/browser/webdata/autofill_table.h"
 #include "chrome/browser/webdata/keyword_table.h"
 #include "chrome/browser/webdata/logins_table.h"
 #include "chrome/browser/webdata/token_service_table.h"
 #include "chrome/browser/webdata/web_apps_table.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "content/public/browser/notification_service.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 // Current version number.  Note: when changing the current version number,
 // corresponding changes must happen in the unit tests, and new migration test
 // added.  See |WebDatabaseMigrationTest::kCurrentTestedVersionNumber|.
 // static
-const int WebDatabase::kCurrentVersionNumber = 47;
+const int WebDatabase::kCurrentVersionNumber = 48;
 
 namespace {
 
-const int kCompatibleVersionNumber = 47;
+const int kCompatibleVersionNumber = 48;
 
 // Change the version number and possibly the compatibility version of
 // |meta_table_|.
 void ChangeVersion(sql::MetaTable* meta_table,
                    int version_num,
                    bool update_compatible_version_num) {
   meta_table->SetVersionNumber(version_num);
   if (update_compatible_version_num) {
     meta_table->SetCompatibleVersionNumber(
           std::min(version_num, kCompatibleVersionNumber));
@@ skipping 112 matching lines @@
   // If the migration fails we return an error to caller and do not commit
   // the migration.
   sql::InitStatus migration_status = MigrateOldVersionsAsNeeded();
   if (migration_status != sql::INIT_OK)
     return migration_status;
 
   return transaction.Commit() ? sql::INIT_OK : sql::INIT_FAILURE;
 }
 
 sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
-  // Some malware tries to force protector to re-sign things by lowering the
+  // Some malware tried to force protector to re-sign things by lowering the

[Peter Kasting, 2012/12/11 20:09:06]

Nit: In the future, people won't know what protector is, so I'd just say "Some
malware used to lower the version number, causing migration to fail. ..."

[Ivan Korotkov, 2012/12/12 17:02:57]

Done.

   // version number, causing migration to fail. Ensure the version number is at
   // least as high as the compatible version number.
   int current_version = std::max(meta_table_.GetVersionNumber(),
                                  meta_table_.GetCompatibleVersionNumber());
   if (current_version > meta_table_.GetVersionNumber())
     ChangeVersion(&meta_table_, current_version, false);
 
   // Migrate if necessary.
   switch (current_version) {
     // Versions 1 - 19 are unhandled.  Version numbers greater than
@@ skipping 171 matching lines @@
       ChangeVersion(&meta_table_, 46, true);
       // FALL THROUGH
 
     case 46:
       if (!keyword_table_->MigrateToVersion47AddAlternateURLsColumn())
         return FailedMigrationTo(47);
 
       ChangeVersion(&meta_table_, 47, true);
       // FALL THROUGH
 
+    case 47:
+      if (!keyword_table_->MigrateToVersion48RemoveKeywordsBackup())
+        return FailedMigrationTo(48);
+
+      ChangeVersion(&meta_table_, 48, true);
+      // FALL THROUGH
+
     // Add successive versions here.  Each should set the version number and
     // compatible version number as appropriate, then fall through to the next
     // case.
 
     case kCurrentVersionNumber:
       // No migration needed.
       return sql::INIT_OK;
   }
 }