| Index: chrome/browser/history/history_database.cc
|
| diff --git a/chrome/browser/history/history_database.cc b/chrome/browser/history/history_database.cc
|
| index 40eb634c6b9a0524c0f5a1b0e9f1db9fbfeed71e..b067a4242ad4afe0341f4930b172da63f99b3959 100644
|
| --- a/chrome/browser/history/history_database.cc
|
| +++ b/chrome/browser/history/history_database.cc
|
| @@ -27,7 +27,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.
|
| -const int kCurrentVersionNumber = 28;
|
| +const int kCurrentVersionNumber = 29;
|
| const int kCompatibleVersionNumber = 16;
|
| const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold";
|
|
|
| @@ -432,6 +432,15 @@ sql::InitStatus HistoryDatabase::EnsureCurrentVersion() {
|
| meta_table_.SetVersionNumber(cur_version);
|
| }
|
|
|
| + if (cur_version == 28) {
|
| + if (!MigrateMimeType()) {
|
| + LOG(WARNING) << "Unable to migrate history to version 29";
|
| + 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()) <<
|
|
|