Eliminate the archived history database and clean up related code.

chrome/browser/sync/glue/favicon_cache.cc

 // Copyright 2013 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/sync/glue/favicon_cache.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_service.h"
@@ skipping 561 matching lines @@
 }
 
 void FaviconCache::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
   DCHECK_EQ(type, chrome::NOTIFICATION_HISTORY_URLS_DELETED);
 
   content::Details<history::URLsDeletedDetails> deleted_details(details);
 
   // We only care about actual user (or sync) deletions.
-  if (deleted_details->archived)
+  if (deleted_details->expired)
     return;
 
   if (!deleted_details->all_history) {
     DeleteSyncedFavicons(deleted_details->favicon_urls);
     return;
   }
 
   // All history was cleared: just delete all favicons.
   DVLOG(1) << "History clear detected, deleting all synced favicons.";
   syncer::SyncChangeList image_deletions, tracking_deletions;
@@ skipping 465 matching lines @@
 
 size_t FaviconCache::NumFaviconsForTest() const {
   return synced_favicons_.size();
 }
 
 size_t FaviconCache::NumTasksForTest() const {
   return page_task_map_.size();
 }
 
 }  // namespace browser_sync