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

Unified Diff: chrome/browser/webdata/keyword_table.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.h ('k') | chrome/browser/webdata/web_database.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/keyword_table.cc
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index 6e234cb0c1fd79a2a1022c0615bcc1b497d0d8ce..d01d2b24fab68fe9396267cd13d1bc9fc7e441bb 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -385,7 +385,18 @@ bool KeywordTable::MigrateToVersion39AddSyncGUIDColumn() {
"ALTER TABLE keywords ADD COLUMN sync_guid VARCHAR");
}
-bool KeywordTable::MigrateToVersion40AddDefaultSearchEngineBackup() {
+bool KeywordTable::MigrateToVersion40AddDefaultSearchProviderBackup() {
+ int64 value = 0;
+ if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) {
+ // Set default search provider ID and its backup.
+ return SetDefaultSearchProviderID(0);
+ }
+ return SetDefaultSearchProviderBackupID(value);
+}
+
+bool KeywordTable::MigrateToVersion41RewriteDefaultSearchProviderBackup() {
+ // Due to crbug.com/101815 version 40 may contain corrupt or empty
+ // signature. So ignore the signature and simply rewrite it.
int64 value = 0;
if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) {
// Set default search provider ID and its backup.
« no previous file with comments | « chrome/browser/webdata/keyword_table.h ('k') | chrome/browser/webdata/web_database.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698