Eliminate the archived history database and clean up related code.

chrome/browser/history/history_notifications.h

 // 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.
 
 // Structs that hold data used in broadcasting notifications.
 
 #ifndef CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__
 #define CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__
 
 #include <set>
@@ skipping 36 matching lines @@
 };
 
 // Details for NOTIFICATION_HISTORY_URLS_DELETED.
 struct URLsDeletedDetails : public HistoryDetails {
   URLsDeletedDetails();
   virtual ~URLsDeletedDetails();
 
   // Set when all history was deleted. False means just a subset was deleted.
   bool all_history;
 
-  // True if the data was archived. False if the data was deleted in response to
-  // an explicit user action through the History UI.
-  bool archived;
+  // True if the data was expired due to old age. False if the data was deleted
+  // in response to an explicit user action through the History UI.
+  bool expired;
 
   // The URLRows of URLs deleted. This is valid only when |all_history| is false
   // indicating that a subset of history has been deleted. The rows will have
   // the IDs that had been in effect before the deletion in the main history
   // database.
   URLRows rows;
 
   // The list of deleted favicon urls. This is valid only when |all_history| is
   // false, indicating that a subset of history has been deleted.
   std::set<GURL> favicon_urls;
@@ skipping 18 matching lines @@
   explicit KeywordSearchDeletedDetails(URLID url_row_id);
   virtual ~KeywordSearchDeletedDetails();
 
   // The ID of the corresponding URLRow in the main history database.
   URLID url_row_id;
 };
 
 }  // namespace history
 
 #endif  // CHROME_BROWSER_HISTORY_HISTORY_NOTIFICATIONS_H__