| 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.
|
|
|