Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4081)

Unified Diff: chrome/browser/history/top_sites_unittest.cc

Issue 11280070: Fixed TopSitesTest.Blacklisting issue for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sync Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/gtest_filter/unit_tests_disabled ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/top_sites_unittest.cc
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index 0c9c5933d365189c09ca14bf09332a3eac3ac435..8ad3d8ae4d0acc2b8970214f69d1a1b877f05eda 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -1150,7 +1150,12 @@ TEST_F(TopSitesTest, Blacklisting) {
ASSERT_EQ(2u + GetPrepopulatePages().size() - 1, q.urls().size());
EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
EXPECT_EQ("http://google.com/", q.urls()[1].url.spec());
- EXPECT_NE(prepopulate_url.spec(), q.urls()[2].url.spec());
+ // Android has only one prepopulated page which has been blacklisted, so
+ // only 2 urls are returned.
+ if (q.urls().size() > 2)
+ EXPECT_NE(prepopulate_url.spec(), q.urls()[2].url.spec());
+ else
+ EXPECT_EQ(1u, GetPrepopulatePages().size());
}
// Remove all blacklisted sites.
« no previous file with comments | « build/android/gtest_filter/unit_tests_disabled ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698