Eliminate the archived history database and clean up related code.

chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index b94dbc9c66bb32eabdfbffde89b4f41c9ec00850..13073cb64aa0e3d1831d0b6cec262c6eb2ce635d 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -838,7 +838,7 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemove) {
   EXPECT_TRUE(URLsEqual(original_entry2, new_sync_entries[0]));
 }
 
-TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemoveArchive) {
+TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemoveExpired) {
   history::VisitVector original_visits1;
   history::URLRow original_entry1(MakeTypedUrlEntry("http://mine.com", "entry",
                                                     2, 15, false,
@@ -862,8 +862,8 @@ TEST_F(ProfileSyncServiceTypedUrlTest, ProcessUserChangeRemoveArchive) {
 
   history::URLsDeletedDetails changes;
   changes.all_history = false;
-  // Setting archived=true should cause the sync code to ignore this deletion.
-  changes.archived = true;
+  // Setting expired=true should cause the sync code to ignore this deletion.
+  changes.expired = true;
   changes.rows.push_back(history::URLRow(GURL("http://mine.com")));
   scoped_refptr<ThreadNotifier> notifier(
       new ThreadNotifier(history_thread_.get()));