Eliminate the archived history database and clean up related code.

chrome/browser/autocomplete/history_url_provider_unittest.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/autocomplete/history_url_provider.h"
 
 #include <algorithm>
 
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
@@ skipping 231 matching lines @@
   return true;
 }
 
 void HistoryURLProviderTest::TearDown() {
   autocomplete_ = NULL;
 }
 
 void HistoryURLProviderTest::FillData() {
   // Most visits are a long time ago (some tests require this since we do some
   // special logic for things visited very recently). Note that this time must
-  // be more recent than the "archived history" threshold for the data to go
-  // into the main database.
+  // be more recent than the "expire history" threshold for the data to be kept
+  // in the main database.
   //
   // TODO(brettw) It would be nice if we could test this behavior, in which
   // case the time would be specifed in the test_db structure.
   const Time now = Time::Now();
 
   for (size_t i = 0; i < arraysize(test_db); ++i) {
     const TestURLInfo& cur = test_db[i];
     const GURL current_url(cur.url);
     history_service_->AddPageWithDetails(
         current_url, base::UTF8ToUTF16(cur.title), cur.visit_count,
@@ skipping 749 matching lines @@
     autocomplete_->scoring_params_.experimental_scoring_enabled = true;
     ASSERT_NO_FATAL_FAILURE(
         RunTest(ASCIIToUTF16(test_cases[i].input),
                 base::string16(), false, output, max_matches));
     for (int j = 0; j < max_matches; ++j) {
       EXPECT_EQ(test_cases[i].matches[j].experiment_relevance,
                 matches_[j].relevance);
     }
   }
 }