diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 12:52:45 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-19 12:52:45 +0000 |
| commit | 6d6fe593efe370ff53dbf9487fe393083162dbc6 (patch) | |
| tree | c3ba6f67e92d500c9e642d999195ecf0c2252148 /chrome | |
| parent | bb6a44ae72beff0bfb00b3a31ae16fbfde48af2f (diff) | |
| download | chromium_src-6d6fe593efe370ff53dbf9487fe393083162dbc6.zip chromium_src-6d6fe593efe370ff53dbf9487fe393083162dbc6.tar.gz chromium_src-6d6fe593efe370ff53dbf9487fe393083162dbc6.tar.bz2 | |
Allow migration of dbs with no DSP ID to v40
This fixes chrome_frame_net_tests failure caused by r106214.
R=joaodasilva@chromium.org
BUG=None
TEST=Run KeywordTableTest.* and WebDatabaseMigrationTest.* in unit_tests. Verify that Web Data file without default search provider id is migrated to v40 successfully.
Review URL: http://codereview.chromium.org/8353001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106268 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/webdata/keyword_table.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc index 62a8a2b..e6cf033 100644 --- a/chrome/browser/webdata/keyword_table.cc +++ b/chrome/browser/webdata/keyword_table.cc @@ -370,8 +370,10 @@ bool KeywordTable::MigrateToVersion39AddSyncGUIDColumn() { bool KeywordTable::MigrateToVersion40AddDefaultSearchEngineBackup() { int64 value = 0; - if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) - return false; + if (!meta_table_->GetValue(kDefaultSearchProviderKey, &value)) { + // Set default search provider ID and its backup. + return SetDefaultSearchProviderID(0); + } return SetDefaultSearchProviderBackupID(value); } |