Fix broken thumbnails for sites with redirects.

chrome/browser/history/top_sites.cc

 // Copyright (c) 2010 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 231 matching lines @@
     if (request->canceled())
       return;
 
     ApplyBlacklistAndPinnedURLs(top_sites_, &filtered_urls);
   }
   request->ForwardResult(GetTopSitesCallback::TupleType(filtered_urls));
 }
 
 bool TopSites::GetPageThumbnail(const GURL& url, RefCountedBytes** data) const {
   AutoLock lock(lock_);
-  std::map<GURL, Images>::const_iterator found = top_images_.find(url);
+  std::map<GURL, Images>::const_iterator found =
+      top_images_.find(GetCanonicalURL(url));
   if (found == top_images_.end()) {
     found = temp_thumbnails_map_.find(url);
     if (found == temp_thumbnails_map_.end())
       return false;  // No thumbnail for this URL.
   }
 
   Images image = found->second;
   *data = image.thumbnail.get();
   return true;
 }
@@ skipping 109 matching lines @@
   }
 }
 
 std::string TopSites::GetURLString(const GURL& url) {
   lock_.AssertAcquired();
   return GetCanonicalURL(url).spec();
 }
 
 std::string TopSites::GetURLHash(const GURL& url) {
   lock_.AssertAcquired();
-  return MD5String(GetCanonicalURL(url).spec());
+  // We don't use canonical URLs here to be able to blacklist only one of
+  // the two 'duplicate' sites, e.g. 'gmail.com' and 'mail.google.com'.
+  return MD5String(url.spec());
 }
 
 void TopSites::UpdateMostVisited(MostVisitedURLList most_visited) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::DB));
 
   std::vector<size_t> added;    // Indices into most_visited.
   std::vector<size_t> deleted;  // Indices into top_sites_.
   std::vector<size_t> moved;    // Indices into most_visited.
 
   DiffMostVisited(top_sites_, most_visited, &added, &deleted, &moved);
@@ skipping 165 matching lines @@
 
 void TopSites::StoreRedirectChain(const RedirectList& redirects,
                                   size_t destination) {
   lock_.AssertAcquired();
   if (redirects.empty()) {
     NOTREACHED();
     return;
   }
 
   // Map all the redirected URLs to the destination.
-  for (size_t i = 0; i < redirects.size(); i++)
-    canonical_urls_[redirects[i]] = destination;
+  for (size_t i = 0; i < redirects.size(); i++) {
+    // If this redirect is already known, don't replace it with a new one.
+    if (canonical_urls_.find(redirects[i]) == canonical_urls_.end())
+      canonical_urls_[redirects[i]] = destination;
+  }
 }
 
 GURL TopSites::GetCanonicalURL(const GURL& url) const {
   lock_.AssertAcquired();
   std::map<GURL, size_t>::const_iterator found = canonical_urls_.find(url);
   if (found == canonical_urls_.end())
     return url;  // Unknown URL - return unchanged.
   return top_sites_[found->second].url;
 }
 
@@ skipping 47 matching lines @@
     if (i->second != kAlreadyFoundMarker)
       deleted_urls->push_back(i->second);
   }
 }
 
 void TopSites::StartQueryForMostVisited() {
   if (mock_history_service_) {
     // Testing with a mockup.
     // QueryMostVisitedURLs is not virtual, so we have to duplicate the code.
     mock_history_service_->QueryMostVisitedURLs(
-        kTopSitesNumber,
+        kTopSitesNumber + blacklist_->size(),
         kDaysOfHistory,
         &cancelable_consumer_,
         NewCallback(this, &TopSites::OnTopSitesAvailable));
   } else {
     if (!profile_)
       return;
 
     HistoryService* hs = profile_->GetHistoryService(Profile::EXPLICIT_ACCESS);
     // |hs| may be null during unit tests.
     if (hs) {
       hs->QueryMostVisitedURLs(
-          kTopSitesNumber,
+          kTopSitesNumber + blacklist_->size(),
           kDaysOfHistory,
           &cancelable_consumer_,
           NewCallback(this, &TopSites::OnTopSitesAvailable));
     } else {
       LOG(INFO) << "History Service not available.";
     }
   }
 }
 
 void TopSites::StartMigration() {
@@ skipping 97 matching lines @@
 
   int64 range = kMaxUpdateIntervalMinutes - kMinUpdateIntervalMinutes;
   int64 minutes = kMaxUpdateIntervalMinutes -
       last_num_urls_changed_ * range / top_sites_.size();
   return base::TimeDelta::FromMinutes(minutes);
 }
 
 void TopSites::OnTopSitesAvailable(
     CancelableRequestProvider::Handle handle,
     MostVisitedURLList pages) {
-
   AddPrepopulatedPages(&pages);
   ChromeThread::PostTask(ChromeThread::DB, FROM_HERE, NewRunnableMethod(
       this, &TopSites::UpdateMostVisited, pages));
 }
 
 // static
 void TopSites::ProcessPendingCallbacks(PendingCallbackSet pending_callbacks,
                                        const MostVisitedURLList& urls) {
   PendingCallbackSet::iterator i;
   for (i = pending_callbacks.begin();
@@ skipping 96 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