Revert 130005 - Committing:

Changes to add duration into history database. This completes Issue 9605037 which can compute suggestion sites based on time slicing as well as visit duration. A new database table was added for those new fields we may need to experiment on.
Original cl: https://chromiumcodereview.appspot.com/9789001/
comment: HistoryProfileTest.TypicalProfileVersion fails because of the trybots inability to patch the History file - it runs fine locally.
Created by Wei Li weili@chromium.org
BUG=none
TEST=unit-tests
TBR=brettw

Review URL: https://chromiumcodereview.appspot.com/9963038

TBR=georgey@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9956046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130017 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 12 deletions

diff --git a/chrome/browser/history/history_database.cc b/chrome/browser/history/history_database.cc
index f4c3aa1..5a36951 100644
--- a/chrome/browser/history/history_database.cc
+++ b/chrome/browser/history/history_database.cc
@@ -28,7 +28,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 = 21;
+static const int kCurrentVersionNumber = 20;
 static const int kCompatibleVersionNumber = 16;
 static const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold";
 
@@ -311,17 +311,6 @@ sql::InitStatus HistoryDatabase::EnsureCurrentVersion(
     meta_table_.SetValue(kNeedsThumbnailMigrationKey, 1);
   }
 
-  if (cur_version == 20) {
-    // This is the version prior to adding the visit_duration field in visits
-    // database. We need to migrate the database.
-    if (!MigrateVisitsWithoutDuration()) {
-      LOG(WARNING) << "Unable to update history database to version 21.";
-      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()) <<