Eliminate the archived history database and clean up related code.

chrome/browser/history/history_backend.h

Index: chrome/browser/history/history_backend.h
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index f312b1c717495c642d0852e4ef0ac4881a377932..880bd7bbfe6fd526fdc2533d08bf0cce4a7e200b 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -15,7 +15,6 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/memory_pressure_listener.h"
 #include "base/memory/scoped_ptr.h"
-#include "chrome/browser/history/archived_database.h"
 #include "chrome/browser/history/expire_history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_marshaling.h"
@@ -604,11 +603,8 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // The *Text() version performs a brute force query of the history DB to
   // search for results which match the given text query.
   // Both functions assume QueryHistory already checked the DB for validity.
-  void QueryHistoryBasic(URLDatabase* url_db, VisitDatabase* visit_db,
-                         const QueryOptions& options, QueryResults* result);
-  void QueryHistoryText(URLDatabase* url_db,
-                        VisitDatabase* visit_db,
-                        const base::string16& text_query,
+  void QueryHistoryBasic(const QueryOptions& options, QueryResults* result);
+  void QueryHistoryText(const base::string16& text_query,
                         const QueryOptions& options,
                         QueryResults* result);
 
@@ -766,7 +762,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
       scoped_ptr<HistoryDetails> details) OVERRIDE;
 
   virtual void NotifySyncURLsDeleted(bool all_history,
-                                     bool archived,
+                                     bool expired,
                                      URLRows* rows) OVERRIDE;
 
   // Deleting all history ------------------------------------------------------
@@ -774,9 +770,9 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // Deletes all history. This is a special case of deleting that is separated
   // from our normal dependency-following method for performance reasons. The
   // logic lives here instead of ExpireHistoryBackend since it will cause
-  // re-initialization of some databases such as Thumbnails or Archived that
-  // could fail. When these databases are not valid, our pointers must be NULL,
-  // so we need to handle this type of operation to keep the pointers in sync.
+  // re-initialization of some databases (e.g. Thumbnails) that could fail.
+  // When these databases are not valid, our pointers must be NULL, so we need
+  // to handle this type of operation to keep the pointers in sync.
   void DeleteAllHistory();
 
   // Given a vector of all URLs that we will keep, removes all thumbnails
@@ -819,9 +815,6 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   bool scheduled_kill_db_;  // Database is being killed due to error.
   scoped_ptr<ThumbnailDatabase> thumbnail_db_;
 
-  // Stores old history in a larger, slower database.
-  scoped_ptr<ArchivedDatabase> archived_db_;
-
   // Manages expiration between the various databases.
   ExpireHistoryBackend expirer_;