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

chrome/browser/history/top_sites_impl_unittest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
@@ skipping 1426 matching lines @@
 
   // Check URLs. When collision occurs, the incoming one is always preferred.
   ASSERT_EQ(3u + GetPrepopulatePages().size(), querier.urls().size());
   EXPECT_EQ("http://url/0", querier.urls()[0].url.spec());
   EXPECT_EQ(1000u, querier.urls()[0].last_forced_time.ToJsTime());
   EXPECT_EQ("http://url/1", querier.urls()[1].url.spec());
   EXPECT_EQ("http://url/2", querier.urls()[2].url.spec());
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 3));
 }
 
+TEST_F(TopSitesImplTest, SetTopSitesWithAlreadyExistingForcedURLs) {
+  // Set the initial list of URLs.
+  MostVisitedURLList old_url_list;
+  AppendForcedMostVisitedURL(&old_url_list, GURL("http://url/0/redir"), 1000);
+  AppendForcedMostVisitedURL(&old_url_list, GURL("http://url/1"), 2000);
+  SetTopSites(old_url_list);
+
+  // Setup a new URL list that will cause collisions.
+  MostVisitedURLList new_url_list;
+  AppendMostVisitedURLWithRedirect(&new_url_list, GURL("http://url/0/redir"),
+                                   GURL("http://url/0"));
+  AppendMostVisitedURL(&new_url_list, GURL("http://url/1"));
+  SetTopSites(new_url_list);
+
+  // Query all URLs.
+  TopSitesQuerier querier;
+  querier.QueryAllTopSites(top_sites(), false, true);
+
+  // Check URLs. When collision occurs, the non-forced one is always preferred.
+  ASSERT_EQ(2u + GetPrepopulatePages().size(), querier.urls().size());
+  EXPECT_EQ("http://url/0", querier.urls()[0].url.spec());
+  EXPECT_EQ("http://url/0/redir", querier.urls()[0].redirects[0].spec());
+  EXPECT_TRUE(querier.urls()[0].last_forced_time.is_null());
+  EXPECT_EQ("http://url/1", querier.urls()[1].url.spec());
+  EXPECT_TRUE(querier.urls()[1].last_forced_time.is_null());
+  ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 2));
+}
+
 TEST_F(TopSitesImplTest, AddForcedURL) {
   // Set the initial list of URLs.
   MostVisitedURLList url_list;
   AppendForcedMostVisitedURL(&url_list, GURL("http://forced/0"), 2000);
   AppendForcedMostVisitedURL(&url_list, GURL("http://forced/1"), 4000);
   AppendMostVisitedURL(&url_list, GURL("http://nonforced/0"));
   AppendMostVisitedURL(&url_list, GURL("http://nonforced/1"));
   AppendMostVisitedURL(&url_list, GURL("http://nonforced/2"));
   SetTopSites(url_list);
 
@@ skipping 82 matching lines @@
   ASSERT_EQ(orig_thumbnail.getSize(), thumbnail.getSize());
   orig_thumbnail.lockPixels();
   thumbnail.lockPixels();
   EXPECT_EQ(0, memcmp(orig_thumbnail.getPixels(), thumbnail.getPixels(),
                       orig_thumbnail.getSize()));
   thumbnail.unlockPixels();
   orig_thumbnail.unlockPixels();
 }
 
 }  // namespace history