Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3439)

Unified Diff: chrome/browser/webdata/web_database.cc

Issue 8502019: Added internal Protector key to official build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added check for DSP Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/webdata/keyword_table.cc ('k') | chrome/browser/webdata/web_database_migration_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/web_database.cc
diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc
index bc21cf176573ac5febddecb41b24b5e18ff05aca..ab935425a84591a97af7e2b7687475418b1a939c 100644
--- a/chrome/browser/webdata/web_database.cc
+++ b/chrome/browser/webdata/web_database.cc
@@ -22,8 +22,8 @@ namespace {
// 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|.
-const int kCurrentVersionNumber = 40;
-const int kCompatibleVersionNumber = 40;
+const int kCurrentVersionNumber = 41;
+const int kCompatibleVersionNumber = 41;
// Change the version number and possibly the compatibility version of
// |meta_table_|.
@@ -305,12 +305,20 @@ sql::InitStatus WebDatabase::MigrateOldVersionsAsNeeded() {
// FALL THROUGH
case 39:
- if (!keyword_table_->MigrateToVersion40AddDefaultSearchEngineBackup())
+ if (!keyword_table_->MigrateToVersion40AddDefaultSearchProviderBackup())
return FailedMigrationTo(40);
ChangeVersion(&meta_table_, 40, true);
// FALL THROUGH
+ case 40:
+ if (!keyword_table_->
+ MigrateToVersion41RewriteDefaultSearchProviderBackup())
+ return FailedMigrationTo(41);
+
+ ChangeVersion(&meta_table_, 41, 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.
« no previous file with comments | « chrome/browser/webdata/keyword_table.cc ('k') | chrome/browser/webdata/web_database_migration_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698