Removed archived history file deletion on browser start

components/history/core/browser/history_backend.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 "components/history/core/browser/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
@@ skipping 271 matching lines @@
 }
 
 base::FilePath HistoryBackend::GetThumbnailFileName() const {
   return history_dir_.Append(kThumbnailsFilename);
 }
 
 base::FilePath HistoryBackend::GetFaviconsFileName() const {
   return history_dir_.Append(kFaviconsFilename);
 }
 
-base::FilePath HistoryBackend::GetArchivedFileName() const {
-  return history_dir_.Append(kArchivedHistoryFilename);
-}
-
 SegmentID HistoryBackend::GetLastSegmentID(VisitID from_visit) {
   // Set is used to detect referrer loops.  Should not happen, but can
   // if the database is corrupt.
   std::set<VisitID> visit_set;
   VisitID visit_id = from_visit;
   while (visit_id) {
     VisitRow row;
     if (!db_->GetRowForVisit(visit_id, &row))
       return 0;
     if (row.segment_id)
@@ skipping 305 matching lines @@
   // the blocks the caller, yet allows other messages through. For this reason
   // we only set db_ to the created database if creation is successful. That
   // way other methods won't do anything as db_ is still null.
 
   TimeTicks beginning_time = TimeTicks::Now();
 
   // Compute the file names.
   history_dir_ = history_database_params.history_dir;
   base::FilePath history_name = history_dir_.Append(kHistoryFilename);
   base::FilePath thumbnail_name = GetFaviconsFileName();
-  base::FilePath archived_name = GetArchivedFileName();
 
   // Delete the old index database files which are no longer used.
   DeleteFTSIndexDatabases();
 
   // History database.
   db_.reset(new HistoryDatabase(
       history_database_params.download_interrupt_reason_none,
       history_database_params.download_interrupt_reason_crash));
 
   // Unretained to avoid a ref loop with db_.
@@ skipping 43 matching lines @@
   if (thumbnail_db_->Init(thumbnail_name) != sql::INIT_OK) {
     // Unlike the main database, we don't error out when the database is too
     // new because this error is much less severe. Generally, this shouldn't
     // happen since the thumbnail and main database versions should be in sync.
     // We'll just continue without thumbnails & favicons in this case or any
     // other error.
     LOG(WARNING) << "Could not initialize the thumbnail database.";
     thumbnail_db_.reset();
   }
 
-  // Nuke any files corresponding to the legacy Archived History Database, which
-  // previously retained expired (> 3 months old) history entries, but, in the
-  // end, was not used for much, and consequently has been removed as of M37.
-  // TODO(engedy): Remove this code after the end of 2014.
-  sql::Connection::Delete(archived_name);
-
   // Generate the history and thumbnail database metrics only after performing
   // any migration work.
   if (base::RandInt(1, 100) == 50) {
     // Only do this computation sometimes since it can be expensive.
     db_->ComputeDatabaseMetrics(history_name);
     if (thumbnail_db_)
       thumbnail_db_->ComputeDatabaseMetrics();
   }
 
   expirer_.SetDatabases(db_.get(), thumbnail_db_.get());
@@ skipping 2007 matching lines @@
   // transaction is currently open.
   db_->CommitTransaction();
   db_->Vacuum();
   db_->BeginTransaction();
   db_->GetStartDate(&first_recorded_time_);
 
   return true;
 }
 
 }  // namespace history