Unpin deleted URLs + better deleting algorithm.

chrome/browser/history/top_sites.cc

 // Copyright (c) 2009 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.h"
 
 #include <algorithm>
 
 #include "app/l10n_util.h"
 #include "base/command_line.h"
@@ skipping 514 matching lines @@
   // |hs| may be null during unit tests.
   if (!hs)
     return;
   HistoryService::Handle handle =
       hs->GetPageThumbnail(top_sites_[index].url,
                            &cancelable_consumer_,
                            NewCallback(this, &TopSites::OnThumbnailAvailable));
   cancelable_consumer_.SetClientData(hs, handle, index);
 }
 
+void TopSites::GenerateCanonicalURLs() {
+  canonical_urls_.clear();
+  for (size_t i = 0; i < top_sites_.size(); i++) {
+    const MostVisitedURL& mv = top_sites_[i];
+    StoreRedirectChain(mv.redirects, i);
+  }
+}
+
 void TopSites::StoreMostVisited(MostVisitedURLList* most_visited) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
   // Take ownership of the most visited data.
   top_sites_.clear();
   top_sites_.swap(*most_visited);
   waiting_for_results_ = false;
 
   // Save the redirect information for quickly mapping to the canonical URLs.
-  canonical_urls_.clear();
+  GenerateCanonicalURLs();
+
   for (size_t i = 0; i < top_sites_.size(); i++) {
     const MostVisitedURL& mv = top_sites_[i];
-    StoreRedirectChain(mv.redirects, i);
-
     std::map<GURL, Images>::iterator it = temp_thumbnails_map_.begin();
     GURL canonical_url = GetCanonicalURL(mv.url);
     for (; it != temp_thumbnails_map_.end(); it++) {
       // Must map all temp URLs to canonical ones.
       // temp_thumbnails_map_ contains non-canonical URLs, because
       // when we add a temp thumbnail, redirect chain is not known.
       // This is slow, but temp_thumbnails_map_ should have very few URLs.
       if (canonical_url == GetCanonicalURL(it->first)) {
         SetPageThumbnail(mv.url, it->second.thumbnail,
                          it->second.thumbnail_score);
@@ skipping 237 matching lines @@
 void TopSites::Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
   if (type == NotificationType::HISTORY_URLS_DELETED) {
     Details<history::URLsDeletedDetails> deleted_details(details);
     if (deleted_details->all_history) {
       top_sites_.clear();
       ChromeThread::PostTask(ChromeThread::DB, FROM_HERE,
                              NewRunnableMethod(this, &TopSites::ResetDatabase));
     } else {
+      std::set<size_t> indices_to_delete;  // Indices into top_sites_.
       std::set<GURL>::iterator it;
       for (it = deleted_details->urls.begin();
            it != deleted_details->urls.end(); ++it) {
-        for (size_t i = 0; i < top_sites_.size(); i++) {
-          if (top_sites_[i].url == *it) {
-            top_sites_.erase(top_sites_.begin() + i);
-            break;
-          }
-        }
+        std::map<GURL,size_t>::const_iterator found = canonical_urls_.find(*it);
+        if (found != canonical_urls_.end())
+          indices_to_delete.insert(found->second);
+      }
+
+      for (std::set<size_t>::reverse_iterator i = indices_to_delete.rbegin();
+           i != indices_to_delete.rend(); i++) {
+        size_t index = *i;
+        RemovePinnedURL(top_sites_[index].url);
+        top_sites_.erase(top_sites_.begin() + index);
       }
     }
+    // Canonical URLs are not valid any more.
+    GenerateCanonicalURLs();
     StartQueryForMostVisited();
   } else if (type == NotificationType::NAV_ENTRY_COMMITTED) {
     if (top_sites_.size() < kTopSitesNumber) {
       const NavigationController::LoadCommittedDetails& load_details =
           *Details<NavigationController::LoadCommittedDetails>(details).ptr();
       GURL url = load_details.entry->url();
       if (canonical_urls_.find(url) == canonical_urls_.end() &&
            HistoryService::CanAddURL(url)) {
         // Add this page to the known pages in case the thumbnail comes
         // in before we get the results.
@@ skipping 13 matching lines @@
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
   db_.reset(new TopSitesDatabaseImpl());
   file_util::Delete(db_path_, false);
   if (!db_->Init(db_path_)) {
     NOTREACHED() << "Failed to initialize database.";
     return;
   }
 }
 
 }  // namespace history