Fixed TopSitesTest.Blacklisting issue for Android

chrome/browser/history/top_sites_unittest.cc

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..a595e45a0ba0b6c912d4913578d0bd61b6e1551e 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -1150,7 +1150,10 @@ 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());

[sky, 2012/11/27 18:07:01]

Can you add an else case that does:
EXPECT_EQ(1u, GetPropopulatePates().size());

[michaelbai, 2012/11/27 20:07:06]

Done.

   }
 
   // Remove all blacklisted sites.