Fixed TopSitesTest.Blacklisting issue for Android

chrome/browser/history/top_sites_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/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/format_macros.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 1132 matching lines @@
   EXPECT_TRUE(top_sites()->HasBlacklistedItems());
   EXPECT_FALSE(top_sites()->IsBlacklisted(GURL("http://google.com/")));
 
   // Make sure google is returned now.
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
     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.
   top_sites()->ClearBlacklistedURLs();
   EXPECT_FALSE(top_sites()->HasBlacklistedItems());
 
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
     ASSERT_EQ(2u + GetPrepopulatePages().size(), q.urls().size());
@@ skipping 85 matching lines @@
       chrome::NOTIFICATION_TOP_SITES_LOADED,
       content::Source<Profile>(profile()));
   profile()->CreateTopSites();
   HistoryServiceFactory::GetForProfile(
       profile(), Profile::EXPLICIT_ACCESS)->UnloadBackend();
   profile()->BlockUntilHistoryProcessesPendingRequests();
   observer.Wait();
 }
 
 }  // namespace history