Eliminate the archived history database and clean up related code.

chrome/browser/history/history_database.cc

 // 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 "chrome/browser/history/history_database.h"
 
 #include <algorithm>
 #include <set>
 #include <string>
 
@@ skipping 15 matching lines @@
 
 // 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
 // our database without *too* many bad effects.
 const int kCurrentVersionNumber = 28;
 const int kCompatibleVersionNumber = 16;
 const char kEarlyExpirationThresholdKey[] = "early_expiration_threshold";
 
 }  // namespace
 
-HistoryDatabase::HistoryDatabase()
-    : needs_version_17_migration_(false) {
+HistoryDatabase::HistoryDatabase() {
 }
 
 HistoryDatabase::~HistoryDatabase() {
 }
 
 sql::InitStatus HistoryDatabase::Init(const base::FilePath& history_name) {
   db_.set_histogram_tag("History");
 
   // Set the exceptional sqlite error handler.
   db_.set_error_callback(error_callback_);
@@ skipping 165 matching lines @@
   if (!DropKeywordSearchTermsTable())
     return false;
   if (!InitKeywordSearchTermsTable())
     return false;
 
   if (!DropSegmentTables())
     return false;
   if (!InitSegmentTables())
     return false;
 
-  // We also add the supplementary URL indices at this point. This index is
-  // over parts of the URL table that weren't automatically created when the
-  // temporary URL table was
   CreateKeywordSearchTermsIndices();
   return true;
 }
 
 void HistoryDatabase::Vacuum() {
   DCHECK_EQ(0, db_.transaction_nesting()) <<
       "Can not have a transaction when vacuuming.";
   ignore_result(db_.Execute("VACUUM"));
 }
 
@@ skipping 56 matching lines @@
 
 // Migration -------------------------------------------------------------------
 
 sql::InitStatus HistoryDatabase::EnsureCurrentVersion() {
   // We can't read databases newer than we were designed for.
   if (meta_table_.GetCompatibleVersionNumber() > kCurrentVersionNumber) {
     LOG(WARNING) << "History database is too new.";
     return sql::INIT_TOO_NEW;
   }
 
-  // NOTICE: If you are changing structures for things shared with the archived
-  // history file like URLs, visits, or downloads, that will need migration as
-  // well. Instead of putting such migration code in this class, it should be
-  // in the corresponding file (url_database.cc, etc.) and called from here and
-  // from the archived_database.cc.
-
   int cur_version = meta_table_.GetVersionNumber();
 
   // Put migration code here
 
   if (cur_version == 15) {
     if (!db_.Execute("DROP TABLE starred") || !DropStarredIDFromURLs()) {
       LOG(WARNING) << "Unable to update history database to version 16.";
       return sql::INIT_FAILURE;
     }
     ++cur_version;
@@ skipping 130 matching lines @@
       "SET last_visit_time = last_visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM urls WHERE last_visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE visits "
       "SET visit_time = visit_time + 11644473600000000 "
       "WHERE id IN (SELECT id FROM visits WHERE visit_time > 0);"));
   ignore_result(db_.Execute(
       "UPDATE segment_usage "
       "SET time_slot = time_slot + 11644473600000000 "
       "WHERE id IN (SELECT id FROM segment_usage WHERE time_slot > 0);"));
-
-  // Erase all the full text index files. These will take a while to update and
-  // are less important, so we just blow them away. Same with the archived
-  // database.
-  needs_version_17_migration_ = true;
 }
 #endif
 
 }  // namespace history