Ensures TopSitesImpl::MergeCachedForcedURLs doesn't keep forced URLs if they are part of the redire…

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"
@@ skipping 643 matching lines @@
   return added;
 }
 
 size_t TopSitesImpl::MergeCachedForcedURLs(MostVisitedURLList* new_list) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // Add all the new URLs for quick lookup. Take that opportunity to count the
   // number of forced URLs in |new_list|.
   std::set<GURL> all_new_urls;
   size_t num_forced = 0;
   for (size_t i = 0; i < new_list->size(); ++i) {
-    all_new_urls.insert((*new_list)[i].url);
+    for (size_t j = 0; j < (*new_list)[i].redirects.size(); j++) {
+      all_new_urls.insert((*new_list)[i].redirects[j]);
+    }
     if (!(*new_list)[i].last_forced_time.is_null())
       ++num_forced;
   }
 
   // Keep the forced URLs from |cache_| that are not found in |new_list|.
   MostVisitedURLList filtered_forced_urls;
   for (size_t i = 0; i < cache_->GetNumForcedURLs(); ++i) {
     if (all_new_urls.find(cache_->top_sites()[i].url) == all_new_urls.end())
       filtered_forced_urls.push_back(cache_->top_sites()[i]);
   }
@@ skipping 255 matching lines @@
       base::TimeDelta::FromSeconds(kUpdateIntervalSecs));
 }
 
 void TopSitesImpl::OnTopSitesAvailableFromHistory(
     CancelableRequestProvider::Handle handle,
     MostVisitedURLList pages) {
   SetTopSites(pages);
 }
 
 }  // namespace history