[Password Manager] Update SQL database version in response to rollback

components/password_manager/core/browser/login_database.cc

 // Copyright 2014 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 "components/password_manager/core/browser/login_database.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/pickle.h"
 #include "base/strings/string_util.h"
 #include "base/time/time.h"
 #include "components/autofill/core/common/password_form.h"
 #include "google_apis/gaia/gaia_auth_util.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "sql/connection.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 using autofill::PasswordForm;
 
 namespace password_manager {
 
-static const int kCurrentVersionNumber = 7;
+static const int kCurrentVersionNumber = 8;
 static const int kCompatibleVersionNumber = 1;
 
 Pickle SerializeVector(const std::vector<base::string16>& vec) {
   Pickle p;
   for (size_t i = 0; i < vec.size(); ++i) {
     p.WriteString16(vec[i]);
   }
   return p;
 }
 
@@ skipping 178 matching lines @@
     case 6:
       if (!db_.Execute("ALTER TABLE logins ADD COLUMN display_name VARCHAR") ||
           !db_.Execute("ALTER TABLE logins ADD COLUMN avatar_url VARCHAR") ||
           !db_.Execute("ALTER TABLE logins "
                        "ADD COLUMN federation_url VARCHAR") ||
           !db_.Execute("ALTER TABLE logins ADD COLUMN is_zero_click INTEGER")) {
         return false;
       }
       meta_table_.SetVersionNumber(7);
       // Fall through.
+    case 7:
+      // Keep version 8 around even though no changes are made. See
+      // crbug.com/423716 for context.
+      meta_table_.SetVersionNumber(8);
+      // Fall through.
       // TODO(gcasto): Remove use_additional_auth by copying table.
       // https://www.sqlite.org/lang_altertable.html
     case kCurrentVersionNumber:
       // Already up to date
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
@@ skipping 522 matching lines @@
 
 bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
   DCHECK(db_.is_open());
   meta_table_.Reset();
   db_.Close();
   sql::Connection::Delete(db_path_);
   return Init(db_path_);
 }
 
 }  // namespace password_manager