Changes to add duration into history database.

chrome/browser/history/archived_database.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 #include <string>
 
 #include "base/string_util.h"
 #include "chrome/browser/history/archived_database.h"
 #include "sql/transaction.h"
 
 namespace history {
 
 namespace {
 
-static const int kCurrentVersionNumber = 3;
+static const int kCurrentVersionNumber = 4;
 static const int kCompatibleVersionNumber = 2;
 
 }  // namespace
 
 ArchivedDatabase::ArchivedDatabase() {
 }
 
 ArchivedDatabase::~ArchivedDatabase() {
 }
 
@@ skipping 50 matching lines @@
 }
 
 void ArchivedDatabase::CommitTransaction() {
   db_.CommitTransaction();
 }
 
 sql::Connection& ArchivedDatabase::GetDB() {
   return db_;
 }
 
+// static
+int ArchivedDatabase::GetCurrentVersion() {
+  return kCurrentVersionNumber;
+}
+
 // Migration -------------------------------------------------------------------
 
 sql::InitStatus ArchivedDatabase::EnsureCurrentVersion() {
   // We can't read databases newer than we were designed for.
   if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) {
     LOG(WARNING) << "Archived database is too new.";
     return sql::INIT_TOO_NEW;
   }
 
   // NOTICE: If you are changing structures for things shared with the archived
@@ skipping 13 matching lines @@
     meta_table_.SetCompatibleVersionNumber(
         std::min(cur_version, kCompatibleVersionNumber));
   }
 
   if (cur_version == 2) {
     // This is the version prior to adding visit_source table.
     ++cur_version;
     meta_table_.SetVersionNumber(cur_version);
   }
 
+  if (cur_version == 3) {
+    // 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 archived database to version 4.";
+      return sql::INIT_FAILURE;
+    }
+    ++cur_version;
+    meta_table_.SetVersionNumber(cur_version);
+  }
+
   // Put future migration cases here.
 
   // 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 < kCurrentVersionNumber) <<
       "Archived database version " << cur_version << " is too old to handle.";
 
   return sql::INIT_OK;
 }
 }  // namespace history