Chromium Code Reviews| Index: chrome/browser/history/history_database.cc |
| diff --git a/chrome/browser/history/history_database.cc b/chrome/browser/history/history_database.cc |
| index 348683a2bcc2dbaeaf0ec1add1bdf1dd3cc76a06..f2afa0878f8f3ef4fb97041e9ed66f8b27c5d508 100644 |
| --- a/chrome/browser/history/history_database.cc |
| +++ b/chrome/browser/history/history_database.cc |
| @@ -26,7 +26,7 @@ namespace { |
| // Current version number. We write databases at the "current" version number, |
| // but any previous version that can read the "compatible" one can make do with |
| // or database without *too* many bad effects. |
| -static const int kCurrentVersionNumber = 23; |
| +static const int kCurrentVersionNumber = 24; |
| static const int kCompatibleVersionNumber = 16; |
| static const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold"; |
| @@ -342,6 +342,16 @@ sql::InitStatus HistoryDatabase::EnsureCurrentVersion() { |
| meta_table_.SetVersionNumber(cur_version); |
| } |
| + if (cur_version == 23) { |
| + if (!MigrateReasonAndPaths()) { |
|
benjhayden
2012/11/14 19:43:22
Put 'Downloads' in this method name?
Randy Smith (Not in Mondays)
2012/11/14 22:47:34
Done.
|
| + LOG(WARNING) << "Unable to upgrade download interrupt reason and paths"; |
| + // Invalid state values may cause crashes. |
| + return sql::INIT_FAILURE; |
| + } |
| + cur_version++; |
| + meta_table_.SetVersionNumber(cur_version); |
| + } |
| + |
| // When the version is too old, we just try to continue anyway, there should |
| // not be a released product that makes a database too old for us to handle. |
| LOG_IF(WARNING, cur_version < GetCurrentVersion()) << |