Componentize TopSites, TopSitesBackend, TopSitesDatabase

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/strings/utf_string_conversions.h"
 #include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/top_sites_factory.h"
 #include "chrome/browser/history/top_sites_impl.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/history/core/browser/history_db_task.h"
 #include "components/history/core/browser/history_types.h"
+#include "components/history/core/browser/top_sites.h"
 #include "components/history/core/browser/top_sites_cache.h"
 #include "components/history/core/test/history_unittest_base.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "url/gurl.h"
 
 using content::BrowserThread;
 
 namespace history {
 
 namespace {
 
+static const char kPrepopulatedPageURL[] =
+    "http://www.google.com/int/chrome/welcome.html";
+
+// Create a TopSites implementation for testing.
+scoped_refptr<RefcountedKeyedService> BuildTopSitesImpl(
+    content::BrowserContext* context) {
+  PrepopulatedPageList prepopulated_pages;
+  prepopulated_pages.push_back(PrepopulatedPage(GURL(kPrepopulatedPageURL),
+                                                base::string16(), -1, -1, 0));
+
+  scoped_refptr<TopSitesImpl> top_sites =
+      new TopSitesImpl(static_cast<Profile*>(context), prepopulated_pages);
+  top_sites->Init(
+      context->GetPath().Append(chrome::kTopSitesFilename),
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB));
+  return top_sites;
+}
+
 // Used by WaitForHistory, see it for details.
 class WaitForHistoryTask : public HistoryDBTask {
  public:
   WaitForHistoryTask() {}
 
   bool RunOnDBThread(HistoryBackend* backend, HistoryDatabase* db) override {
     return true;
   }
 
   void DoneRunOnMainThread() override { base::MessageLoop::current()->Quit(); }
@@ skipping 154 matching lines @@
   TopSitesImpl* top_sites() {
     return static_cast<TopSitesImpl*>(
         TopSitesFactory::GetForProfile(profile_.get()).get());
   }
   TestingProfile* profile() { return profile_.get(); }
   HistoryService* history_service() {
     return HistoryServiceFactory::GetForProfile(
         profile_.get(), ServiceAccessType::EXPLICIT_ACCESS);
   }
 
-  MostVisitedURLList GetPrepopulatePages() {
-    return top_sites()->GetPrepopulatePages();
+  PrepopulatedPageList GetPrepopulatedPages() {

[droger, 2015/01/27 10:08:36]

Return a const reference?

[sdefresne, 2015/01/27 13:55:16]

I can't since top_sites()->GetPrepopulatedPages() does not return a const
reference. That would be returning a const reference to a local variable I
think, which is incorrect.

+    return top_sites()->GetPrepopulatedPages();
   }
 
   // Returns true if the TopSitesQuerier contains the prepopulate data starting
   // at |start_index|.
   void ContainsPrepopulatePages(const TopSitesQuerier& querier,
                                 size_t start_index) {
-    MostVisitedURLList prepopulate_urls = GetPrepopulatePages();
-    ASSERT_LE(start_index + prepopulate_urls.size(), querier.urls().size());
-    for (size_t i = 0; i < prepopulate_urls.size(); ++i) {
-      EXPECT_EQ(prepopulate_urls[i].url.spec(),
-                querier.urls()[start_index + i].url.spec()) << " @ index " <<
-          i;
+    PrepopulatedPageList prepopulate_pages = GetPrepopulatedPages();
+    ASSERT_LE(start_index + prepopulate_pages.size(), querier.urls().size());
+    for (size_t i = 0; i < prepopulate_pages.size(); ++i) {
+      EXPECT_EQ(prepopulate_pages[i].url.url.spec(),
+                querier.urls()[start_index + i].url.spec())
+          << " @ index " << i;
     }
   }
 
   // Used for callbacks from history.
-  void EmptyCallback() {
-  }
+  void EmptyCallback() {}

[droger, 2015/01/27 10:08:36]

Optional:
use base::DoNothing() instead.

[sdefresne, 2015/01/27 13:55:16]

Not used.

 
   // Quit the current message loop when invoked. Useful when running a nested
   // message loop.
   void QuitCallback() {
     base::MessageLoop::current()->Quit();
   }
 
   // Adds a page to history.
   void AddPageToHistory(const GURL& url) {
     RedirectList redirects;
@@ skipping 81 matching lines @@
   bool AddPrepopulatedPages(MostVisitedURLList* urls) {
     return top_sites()->AddPrepopulatedPages(urls, 0u);
   }
 
   void EmptyThreadSafeCache() {
     base::AutoLock lock(top_sites()->lock_);
     MostVisitedURLList empty;
     top_sites()->thread_safe_cache_->SetTopSites(empty);
   }
 
-  void CreateTopSites() { profile_->CreateTopSites(); }
+  void CreateTopSites() {
+    profile_->DestroyTopSites();

[droger, 2015/01/27 10:08:37]

Maybe add a comment here explaining why you need to destroy the top sites.
Or rename the method to ResetTopSites() maybe.

[sdefresne, 2015/01/27 13:55:16]

Done.

+    TopSitesFactory::GetInstance()->SetTestingFactory(profile_.get(),
+                                                      BuildTopSitesImpl);
+  }
 
  private:
   base::MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread db_thread_;
   scoped_ptr<TestingProfile> profile_;
   // To cancel HistoryService tasks.
   base::CancelableTaskTracker history_tracker_;
 
   // To cancel TopSitesBackend tasks.
@@ skipping 293 matching lines @@
 
   StartQueryForMostVisited();
   WaitForHistory();
 
   TopSitesQuerier querier;
   querier.QueryTopSites(top_sites(), false);
 
   ASSERT_EQ(1, querier.number_of_callbacks());
 
   // 2 extra prepopulated URLs.
-  ASSERT_EQ(2u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(2u + GetPrepopulatedPages().size(), querier.urls().size());
   EXPECT_EQ(news, querier.urls()[0].url);
   EXPECT_EQ(google, querier.urls()[1].url);
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 2));
 }
 
 // Makes sure changes done to top sites get mirrored to the db.
 TEST_F(TopSitesImplTest, SaveToDB) {
   MostVisitedURL url;
   GURL asdf_url("http://asdf.com");
   base::string16 asdf_title(base::ASCIIToUTF16("ASDF"));
@@ skipping 12 matching lines @@
   // Add a thumbnail.
   gfx::Image tmp_bitmap(CreateBitmap(SK_ColorBLUE));
   ASSERT_TRUE(top_sites()->SetPageThumbnail(asdf_url, tmp_bitmap,
                                             ThumbnailScore()));
 
   RecreateTopSitesAndBlock();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(asdf_url, querier.urls()[0].url);
     EXPECT_EQ(asdf_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
 
     scoped_refptr<base::RefCountedMemory> read_data;
     EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(tmp_bitmap, read_data.get()));
   }
 
   MostVisitedURL url2;
   url2.url = google_url;
   url2.title = google_title;
   url2.redirects.push_back(url2.url);
 
   AddPageToHistory(url2.url, url2.title);
 
   // Add new thumbnail at rank 0 and shift the other result to 1.
   ASSERT_TRUE(top_sites()->SetPageThumbnail(google_url,
                                             tmp_bitmap,
                                             ThumbnailScore()));
 
   // Make TopSites reread from the db.
   RefreshTopSitesAndRecreate();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
-    ASSERT_EQ(2u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(2u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(asdf_url, querier.urls()[0].url);
     EXPECT_EQ(asdf_title, querier.urls()[0].title);
     EXPECT_EQ(google_url, querier.urls()[1].url);
     EXPECT_EQ(google_title, querier.urls()[1].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 2));
   }
 }
 
 // Makes sure forced URLs in top sites get mirrored to the db.
 TEST_F(TopSitesImplTest, SaveForcedToDB) {
@@ skipping 26 matching lines @@
   // Force-flush the cache to ensure we don't reread from it inadvertently.
   EmptyThreadSafeCache();
 
   // Make TopSites reread from the db.
   StartQueryForMostVisited();
   WaitForHistory();
 
   TopSitesQuerier querier;
   querier.QueryAllTopSites(top_sites(), true, true);
 
-  ASSERT_EQ(4u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(4u + GetPrepopulatedPages().size(), querier.urls().size());
   EXPECT_EQ(GURL("http://forced1"), querier.urls()[0].url);
   EXPECT_EQ(base::ASCIIToUTF16("forced1"), querier.urls()[0].title);
   SkBitmap thumbnail = GetThumbnail(GURL("http://forced1"));
   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();
@@ skipping 29 matching lines @@
 
   base::Time add_time(base::Time::Now());
   AddPageToHistory(url.url, url.title, url.redirects, add_time);
 
   RefreshTopSitesAndRecreate();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(asdf_url, querier.urls()[0].url);
     EXPECT_EQ(asdf_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
 
     scoped_refptr<base::RefCountedMemory> read_data;
     EXPECT_TRUE(top_sites()->GetPageThumbnail(asdf_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(asdf_thumbnail, read_data.get()));
   }
 
   MostVisitedURL url2;
@@ skipping 13 matching lines @@
   ASSERT_TRUE(top_sites()->SetPageThumbnail(
                   url2.url, google_thumbnail, ThumbnailScore()));
 
   RefreshTopSitesAndRecreate();
 
   {
     scoped_refptr<base::RefCountedMemory> read_data;
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(2u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(2u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(google1_url, querier.urls()[0].url);
     EXPECT_EQ(google_title, querier.urls()[0].title);
     ASSERT_EQ(3u, querier.urls()[0].redirects.size());
     EXPECT_TRUE(top_sites()->GetPageThumbnail(google3_url, false, &read_data));
     EXPECT_TRUE(ThumbnailEqualsBytes(google_thumbnail, read_data.get()));
 
     EXPECT_EQ(asdf_url, querier.urls()[1].url);
     EXPECT_EQ(asdf_title, querier.urls()[1].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 2));
   }
@@ skipping 48 matching lines @@
 
   AddPageToHistory(google1_url, google_title);
   AddPageToHistory(news_url, news_title);
 
   RefreshTopSitesAndRecreate();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(GetPrepopulatePages().size() + 2, querier.urls().size());
+    ASSERT_EQ(GetPrepopulatedPages().size() + 2, querier.urls().size());
   }
 
   DeleteURL(news_url);
 
   // Wait for history to process the deletion.
   WaitForHistory();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(google_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
   }
 
   // Now reload. This verifies topsites actually wrote the deletion to disk.
   RefreshTopSitesAndRecreate();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), querier.urls().size());
     EXPECT_EQ(google_title, querier.urls()[0].title);
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 1));
   }
 
   DeleteURL(google1_url);
 
   // Wait for history to process the deletion.
   WaitForHistory();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(GetPrepopulatedPages().size(), querier.urls().size());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 0));
   }
 
   // Now reload. This verifies topsites actually wrote the deletion to disk.
   RefreshTopSitesAndRecreate();
 
   {
     TopSitesQuerier querier;
     querier.QueryTopSites(top_sites(), false);
 
-    ASSERT_EQ(GetPrepopulatePages().size(), querier.urls().size());
+    ASSERT_EQ(GetPrepopulatedPages().size(), querier.urls().size());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 0));
   }
 }
 
 // Makes sure GetUpdateDelay is updated appropriately.
 TEST_F(TopSitesImplTest, GetUpdateDelay) {
   SetLastNumUrlsChanged(0);
   EXPECT_EQ(30, GetUpdateDelay().InSeconds());
 
   MostVisitedURLList url_list;
@@ skipping 35 matching lines @@
   // We shouldn't have gotten a callback.
   EXPECT_EQ(0, querier1.number_of_callbacks());
   EXPECT_EQ(0, querier2.number_of_callbacks());
   EXPECT_EQ(0, querier3.number_of_callbacks());
 
   // Wait for loading to complete.
   profile()->BlockUntilTopSitesLoaded();
 
   // Now we should have gotten the callbacks.
   EXPECT_EQ(1, querier1.number_of_callbacks());
-  EXPECT_EQ(GetPrepopulatePages().size(), querier1.urls().size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), querier1.urls().size());
   EXPECT_EQ(1, querier2.number_of_callbacks());
-  EXPECT_EQ(GetPrepopulatePages().size(), querier2.urls().size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), querier2.urls().size());
   EXPECT_EQ(1, querier3.number_of_callbacks());
-  EXPECT_EQ(GetPrepopulatePages().size(), querier3.urls().size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), querier3.urls().size());
 
   // Reset the top sites.
   MostVisitedURLList pages;
   MostVisitedURL url;
   url.url = GURL("http://1.com/");
   url.redirects.push_back(url.url);
   pages.push_back(url);
   url.url = GURL("http://2.com/");
   url.redirects.push_back(url.url);
   pages.push_back(url);
@@ skipping 10 matching lines @@
   querier4.QueryTopSites(top_sites(), false);
 
   // We shouldn't have gotten a callback.
   EXPECT_EQ(0, querier4.number_of_callbacks());
 
   // Wait for loading to complete.
   profile()->BlockUntilTopSitesLoaded();
 
   // Now we should have gotten the callbacks.
   EXPECT_EQ(1, querier4.number_of_callbacks());
-  ASSERT_EQ(2u + GetPrepopulatePages().size(), querier4.urls().size());
+  ASSERT_EQ(2u + GetPrepopulatedPages().size(), querier4.urls().size());
 
   EXPECT_EQ("http://1.com/", querier4.urls()[0].url.spec());
   EXPECT_EQ("http://2.com/", querier4.urls()[1].url.spec());
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier4, 2));
 
   // Reset the top sites again, this time don't reload.
   url.url = GURL("http://3.com/");
   url.redirects.push_back(url.url);
   pages.push_back(url);
   SetTopSites(pages);
 
   // Query again.
   TopSitesQuerier querier5;
   querier5.QueryTopSites(top_sites(), true);
 
   EXPECT_EQ(1, querier5.number_of_callbacks());
 
-  ASSERT_EQ(3u + GetPrepopulatePages().size(), querier5.urls().size());
+  ASSERT_EQ(3u + GetPrepopulatedPages().size(), querier5.urls().size());
   EXPECT_EQ("http://1.com/", querier5.urls()[0].url.spec());
   EXPECT_EQ("http://2.com/", querier5.urls()[1].url.spec());
   EXPECT_EQ("http://3.com/", querier5.urls()[2].url.spec());
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier5, 3));
 }
 
 // Makes sure canceled requests are not notified.
 TEST_F(TopSitesImplTest, CancelingRequestsForTopSites) {
   // Recreate top sites. It won't be loaded now.
   CreateTopSites();
@@ skipping 11 matching lines @@
   EXPECT_EQ(0, querier1.number_of_callbacks());
   EXPECT_EQ(0, querier2.number_of_callbacks());
 
   querier2.CancelRequest();
 
   // Wait for loading to complete.
   profile()->BlockUntilTopSitesLoaded();
 
   // The first callback should succeed.
   EXPECT_EQ(1, querier1.number_of_callbacks());
-  EXPECT_EQ(GetPrepopulatePages().size(), querier1.urls().size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), querier1.urls().size());
 
   // And the canceled callback should not be notified.
   EXPECT_EQ(0, querier2.number_of_callbacks());
 }
 
 // Makes sure temporary thumbnails are copied over correctly.
 TEST_F(TopSitesImplTest, AddTemporaryThumbnail) {
   GURL unknown_url("http://news.google.com/");
   GURL invalid_url("chrome://thumb/http://google.com/");
   GURL url1a("http://google.com/");
@@ skipping 95 matching lines @@
 
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
     EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
     EXPECT_EQ("http://google.com/", q.urls()[1].url.spec());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 2));
   }
 }
 
-#if !defined(OS_ANDROID)
 // Tests variations of blacklisting including blacklisting prepopulated pages.
 // This test is disable for Android because Android does not have any
 // prepopulated pages.
 TEST_F(TopSitesImplTest, BlacklistingWithPrepopulated) {
   MostVisitedURLList pages;
   MostVisitedURL url, url1;
   url.url = GURL("http://bbc.com/");
   url.redirects.push_back(url.url);
   pages.push_back(url);
   url1.url = GURL("http://google.com/");
   url1.redirects.push_back(url1.url);
   pages.push_back(url1);
 
   SetTopSites(pages);
   EXPECT_FALSE(top_sites()->IsBlacklisted(GURL("http://bbc.com/")));
 
   // Blacklist google.com.
   top_sites()->AddBlacklistedURL(GURL("http://google.com/"));
 
-  GURL prepopulate_url = GetPrepopulatePages()[0].url;
+  GURL prepopulate_url = GetPrepopulatedPages()[0].url.url;
 
   EXPECT_TRUE(top_sites()->HasBlacklistedItems());
   EXPECT_TRUE(top_sites()->IsBlacklisted(GURL("http://google.com/")));
   EXPECT_FALSE(top_sites()->IsBlacklisted(GURL("http://bbc.com/")));
   EXPECT_FALSE(top_sites()->IsBlacklisted(prepopulate_url));
 
   // Make sure the blacklisted site isn't returned in the results.
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), q.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), q.urls().size());
     EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 1));
   }
 
   // Recreate top sites and make sure blacklisted url was correctly read.
   RecreateTopSitesAndBlock();
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
-    ASSERT_EQ(1u + GetPrepopulatePages().size(), q.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size(), q.urls().size());
     EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 1));
   }
 
   // Blacklist one of the prepopulate urls.
   top_sites()->AddBlacklistedURL(prepopulate_url);
   EXPECT_TRUE(top_sites()->HasBlacklistedItems());
 
   // Make sure the blacklisted prepopulate url isn't returned.
   {
     TopSitesQuerier q;
     q.QueryTopSites(top_sites(), true);
-    ASSERT_EQ(1u + GetPrepopulatePages().size() - 1, q.urls().size());
+    ASSERT_EQ(1u + GetPrepopulatedPages().size() - 1, q.urls().size());
     EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
     for (size_t i = 1; i < q.urls().size(); ++i)
       EXPECT_NE(prepopulate_url.spec(), q.urls()[i].url.spec());
   }
 
   // Mark google as no longer blacklisted.
   top_sites()->RemoveBlacklistedURL(GURL("http://google.com/"));
   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());
+    ASSERT_EQ(2u + GetPrepopulatedPages().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());
     // 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());
+      EXPECT_EQ(1u, GetPrepopulatedPages().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());
+    ASSERT_EQ(2u + GetPrepopulatedPages().size(), q.urls().size());
     EXPECT_EQ("http://bbc.com/", q.urls()[0].url.spec());
     EXPECT_EQ("http://google.com/", q.urls()[1].url.spec());
     ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 2));
   }
 }
-#endif
 
 // Makes sure prepopulated pages exist.
 TEST_F(TopSitesImplTest, AddPrepopulatedPages) {
   TopSitesQuerier q;
   q.QueryTopSites(top_sites(), true);
-  EXPECT_EQ(GetPrepopulatePages().size(), q.urls().size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), q.urls().size());
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 0));
 
   MostVisitedURLList pages = q.urls();
   EXPECT_FALSE(AddPrepopulatedPages(&pages));
 
-  EXPECT_EQ(GetPrepopulatePages().size(), pages.size());
+  EXPECT_EQ(GetPrepopulatedPages().size(), pages.size());
   q.set_urls(pages);
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(q, 0));
 }
 
 // Ensure calling SetTopSites with forced sites already in the DB works.
 // This test both eviction and
 TEST_F(TopSitesImplTest, SetForcedTopSites) {
   // Create forced elements in old URL list.
   MostVisitedURLList old_url_list;
   AppendForcedMostVisitedURL(&old_url_list, GURL("http://oldforced/0"), 1000);
@@ skipping 137 matching lines @@
                              9000);
   AppendMostVisitedURL(&new_url_list, GURL("http://collision/2"));
   AppendMostVisitedURL(&new_url_list, GURL("http://url/3"));
   SetTopSites(new_url_list);
 
   // Query all URLs.
   TopSitesQuerier querier;
   querier.QueryAllTopSites(top_sites(), false, true);
 
   // Check URLs. When collision occurs, the incoming one is always preferred.
-  ASSERT_EQ(7u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(7u + GetPrepopulatedPages().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://collision/1", querier.urls()[1].url.spec());
   EXPECT_EQ(2000u, querier.urls()[1].last_forced_time.ToJsTime());
   EXPECT_EQ("http://url/2", querier.urls()[2].url.spec());
   EXPECT_EQ(3000u, querier.urls()[2].last_forced_time.ToJsTime());
   EXPECT_EQ("http://collision/0", querier.urls()[3].url.spec());
   EXPECT_EQ(5000u, querier.urls()[3].last_forced_time.ToJsTime());
   EXPECT_EQ("http://noncollision/0", querier.urls()[4].url.spec());
   EXPECT_EQ(9000u, querier.urls()[4].last_forced_time.ToJsTime());
@@ skipping 13 matching lines @@
   SetTopSites(url_list);
 
   // Set the new list of URLs to be exactly the same.
   SetTopSites(MostVisitedURLList(url_list));
 
   // Query all URLs.
   TopSitesQuerier querier;
   querier.QueryAllTopSites(top_sites(), false, true);
 
   // Check URLs. When collision occurs, the incoming one is always preferred.
-  ASSERT_EQ(3u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(3u + GetPrepopulatedPages().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());
+  ASSERT_EQ(2u + GetPrepopulatedPages().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);
 
   // Add forced sites here and there to exercise a couple of cases.
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/2"),
                            base::Time::FromJsTime(5000)));
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/3"),
                            base::Time::FromJsTime(1000)));
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/4"),
                            base::Time::FromJsTime(3000)));
 
   // Check URLs.
   TopSitesQuerier querier;
   querier.QueryAllTopSites(top_sites(), false, true);
-  ASSERT_EQ(8u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(8u + GetPrepopulatedPages().size(), querier.urls().size());
   EXPECT_EQ("http://forced/3", querier.urls()[0].url.spec());
   EXPECT_EQ(1000u, querier.urls()[0].last_forced_time.ToJsTime());
   EXPECT_EQ("http://forced/0", querier.urls()[1].url.spec());
   EXPECT_EQ(2000u, querier.urls()[1].last_forced_time.ToJsTime());
   EXPECT_EQ("http://forced/4", querier.urls()[2].url.spec());
   EXPECT_EQ(3000u, querier.urls()[2].last_forced_time.ToJsTime());
   EXPECT_EQ("http://forced/1", querier.urls()[3].url.spec());
   EXPECT_EQ(4000u, querier.urls()[3].last_forced_time.ToJsTime());
   EXPECT_EQ("http://forced/2", querier.urls()[4].url.spec());
   EXPECT_EQ(5000u, querier.urls()[4].last_forced_time.ToJsTime());
   EXPECT_EQ("http://nonforced/0", querier.urls()[5].url.spec());
   EXPECT_TRUE(querier.urls()[5].last_forced_time.is_null());
   EXPECT_EQ("http://nonforced/1", querier.urls()[6].url.spec());
   EXPECT_TRUE(querier.urls()[6].last_forced_time.is_null());
   EXPECT_EQ("http://nonforced/2", querier.urls()[7].url.spec());
   EXPECT_TRUE(querier.urls()[7].last_forced_time.is_null());
   ASSERT_NO_FATAL_FAILURE(ContainsPrepopulatePages(querier, 8));
 
   // Add some collisions with forced and non-forced. Non-forced URLs are never
   // expected to move.
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/3"),
                            base::Time::FromJsTime(4000)));
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/1"),
                             base::Time::FromJsTime(1000)));
   EXPECT_FALSE(AddForcedURL(GURL("http://nonforced/0"),
                             base::Time::FromJsTime(6000)));
 
   // Check relevant URLs.
   querier.QueryAllTopSites(top_sites(), false, true);
-  ASSERT_EQ(8u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(8u + GetPrepopulatedPages().size(), querier.urls().size());
   EXPECT_EQ("http://forced/1", querier.urls()[0].url.spec());
   EXPECT_EQ(1000u, querier.urls()[0].last_forced_time.ToJsTime());
   EXPECT_EQ("http://forced/3", querier.urls()[3].url.spec());
   EXPECT_EQ(4000u, querier.urls()[3].last_forced_time.ToJsTime());
   EXPECT_EQ("http://nonforced/0", querier.urls()[5].url.spec());
   EXPECT_TRUE(querier.urls()[5].last_forced_time.is_null());
 
   // Add a timestamp collision and make sure things don't break.
   EXPECT_TRUE(AddForcedURL(GURL("http://forced/5"),
                            base::Time::FromJsTime(4000)));
   querier.QueryAllTopSites(top_sites(), false, true);
-  ASSERT_EQ(9u + GetPrepopulatePages().size(), querier.urls().size());
+  ASSERT_EQ(9u + GetPrepopulatedPages().size(), querier.urls().size());
   EXPECT_EQ(4000u, querier.urls()[3].last_forced_time.ToJsTime());
   EXPECT_EQ(4000u, querier.urls()[4].last_forced_time.ToJsTime());
   // We don't care which order they get sorted in.
   if (querier.urls()[3].url.spec() == "http://forced/3") {
     EXPECT_EQ("http://forced/3", querier.urls()[3].url.spec());
     EXPECT_EQ("http://forced/5", querier.urls()[4].url.spec());
   } else {
     EXPECT_EQ("http://forced/5", querier.urls()[3].url.spec());
     EXPECT_EQ("http://forced/3", querier.urls()[4].url.spec());
   }
@@ skipping 18 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