Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/history/top_sites_impl.cc

 // Copyright (c) 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/history/top_sites_impl.h"
 
 #include <algorithm>
 #include <set>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_db_task.h"
-#include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/top_sites_cache.h"
 #include "chrome/browser/history/url_utils.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "components/history/core/browser/page_usage_data.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 57 matching lines @@
 // Use 100 quality (highest quality) because we're very sensitive to
 // artifacts for these small sized, highly detailed images.
 static const int kTopSitesImageQuality = 100;
 
 TopSitesImpl::TopSitesImpl(Profile* profile)
     : backend_(NULL),
       cache_(new TopSitesCache()),
       thread_safe_cache_(new TopSitesCache()),
       profile_(profile),
       last_num_urls_changed_(0),
-      loaded_(false) {
+      loaded_(false),
+      history_service_observer_(this) {
   if (!profile_)
     return;
 
   if (content::NotificationService::current()) {
-    registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-                   content::Source<Profile>(profile_));
     // Listen for any nav commits. We'll ignore those not related to this
     // profile when we get the notification.
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                    content::NotificationService::AllSources());
   }
   for (int i = 0; i < kPrepopulatedPagesCount; i++) {
     int url_id = kPrepopulatedPages[i].url_id;
     prepopulated_page_urls_.push_back(
         GURL(l10n_util::GetStringUTF8(url_id)));
   }
@@ skipping 611 matching lines @@
 
   int64 range = kMaxUpdateIntervalMinutes - kMinUpdateIntervalMinutes;
   int64 minutes = kMaxUpdateIntervalMinutes -
       last_num_urls_changed_ * range / cache_->top_sites().size();
   return base::TimeDelta::FromMinutes(minutes);
 }
 
 void TopSitesImpl::Observe(int type,
                            const content::NotificationSource& source,
                            const content::NotificationDetails& details) {
+  DCHECK_EQ(content::NOTIFICATION_NAV_ENTRY_COMMITTED, type);
   if (!loaded_)
     return;
 
-  if (type == chrome::NOTIFICATION_HISTORY_URLS_DELETED) {
-    content::Details<history::URLsDeletedDetails> deleted_details(details);
-    if (deleted_details->all_history) {
-      SetTopSites(MostVisitedURLList());
-      backend_->ResetDatabase();
-    } else {
-      std::set<size_t> indices_to_delete;  // Indices into top_sites_.
-      for (URLRows::const_iterator i = deleted_details->rows.begin();
-           i != deleted_details->rows.end(); ++i) {
-        if (cache_->IsKnownURL(i->url()))
-          indices_to_delete.insert(cache_->GetURLIndex(i->url()));
-      }
-
-      if (indices_to_delete.empty())
-        return;
-
-      MostVisitedURLList new_top_sites(cache_->top_sites());
-      for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
-           i != indices_to_delete.rend(); i++) {
-        new_top_sites.erase(new_top_sites.begin() + *i);
-      }
-      SetTopSites(new_top_sites);
-    }
-    StartQueryForMostVisited();
-  } else if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     NavigationController* controller =
         content::Source<NavigationController>(source).ptr();
     Profile* profile = Profile::FromBrowserContext(
         controller->GetWebContents()->GetBrowserContext());
     if (profile == profile_ && !IsNonForcedFull()) {
       content::LoadCommittedDetails* load_details =
           content::Details<content::LoadCommittedDetails>(details).ptr();
       if (!load_details)
         return;
       const GURL& url = load_details->entry->GetURL();
       if (!cache_->IsKnownURL(url) && HistoryService::CanAddURL(url)) {
         // To avoid slamming history we throttle requests when the url updates.
         // To do otherwise negatively impacts perf tests.
         RestartQueryForTopSitesTimer(GetUpdateDelay());
       }
     }
-  }
 }
 
 void TopSitesImpl::SetTopSites(const MostVisitedURLList& new_top_sites) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   MostVisitedURLList top_sites(new_top_sites);
   size_t num_forced_urls = MergeCachedForcedURLs(&top_sites);
   AddPrepopulatedPages(&top_sites, num_forced_urls);
 
   TopSitesDelta delta;
@@ skipping 70 matching lines @@
       filtered_urls_nonforced.assign(thread_safe_cache_->top_sites().begin() +
                                        thread_safe_cache_->GetNumForcedURLs(),
                                      thread_safe_cache_->top_sites().end());
       pending_callbacks.swap(pending_callbacks_);
     }
   }
 
   for (size_t i = 0; i < pending_callbacks.size(); i++)
     pending_callbacks[i].Run(filtered_urls_all, filtered_urls_nonforced);
 
+  HistoryService* hs =
+      HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
+  // |hs| may be null during unit tests.
+  if (hs)
+    history_service_observer_.Add(hs);
+
   NotifyTopSitesLoaded();
 }
 
 void TopSitesImpl::ResetThreadSafeCache() {
   base::AutoLock lock(lock_);
   MostVisitedURLList cached;
   ApplyBlacklist(cache_->top_sites(), &cached);
   thread_safe_cache_->SetTopSites(cached);
 }
 
@@ skipping 31 matching lines @@
   RestartQueryForTopSitesTimer(
       base::TimeDelta::FromSeconds(kUpdateIntervalSecs));
 }
 
 void TopSitesImpl::OnTopSitesAvailableFromHistory(
     const MostVisitedURLList* pages) {
   DCHECK(pages);
   SetTopSites(*pages);
 }
 
+void TopSitesImpl::OnURLsDeleted(HistoryService* history_service,
+                                 bool all_history,
+                                 bool expired,
+                                 const URLRows& deleted_rows,
+                                 const std::set<GURL>& favicon_urls) {
+  if (!loaded_)
+    return;
+
+  if (all_history) {
+    SetTopSites(MostVisitedURLList());
+    backend_->ResetDatabase();
+  } else {
+    std::set<size_t> indices_to_delete;  // Indices into top_sites_.
+    for (const auto& row : deleted_rows) {
+      if (cache_->IsKnownURL(row.url()))
+        indices_to_delete.insert(cache_->GetURLIndex(row.url()));
+    }
+
+    if (indices_to_delete.empty())
+      return;
+
+    MostVisitedURLList new_top_sites(cache_->top_sites());
+    for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
+         i != indices_to_delete.rend(); i++) {
+      new_top_sites.erase(new_top_sites.begin() + *i);
+    }
+    SetTopSites(new_top_sites);
+  }
+  StartQueryForMostVisited();
+}
+
+void TopSitesImpl::HistoryServiceBeingDeleted(HistoryService* history_service) {
+  history_service_observer_.Remove(history_service);
+}
+
 }  // namespace history