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

Unified Diff: chrome/browser/autocomplete/zero_suggest_provider_unittest.cc

Issue 815983002: Topsites become keyedService based. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the Review comments Created 5 years, 11 months 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
Index: chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
index 8dd1a0fd5fd6f1e96031523caa0daa4d83c1d163..a76281601a2f6f01e6ac42f15d33aee257719117 100644
--- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
+++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
#include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
#include "chrome/browser/history/top_sites.h"
+#include "chrome/browser/history/top_sites_factory.h"
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/common/pref_names.h"
#include "chrome/test/base/testing_profile.h"
@@ -109,6 +110,12 @@ void FakeEmptyTopSites::GetMostVisitedURLs(
mv_callback = callback;
}
+scoped_refptr<RefcountedKeyedService> BuildFakeEmptyTopSites(
+ content::BrowserContext* profile) {
+ scoped_refptr<history::TopSites> top_sites = new FakeEmptyTopSites();
+ return top_sites;
+}
+
} // namespace
@@ -174,8 +181,8 @@ void ZeroSuggestProviderTest::SetUp() {
default_t_url_ = new TemplateURL(data);
turl_model->Add(default_t_url_);
turl_model->SetUserSelectedDefaultSearchProvider(default_t_url_);
-
- profile_.SetTopSites(new FakeEmptyTopSites());
+ TopSitesFactory::GetInstance()->SetTestingFactory(profile_,
+ BuildFakeEmptyTopSites);
provider_ = ZeroSuggestProvider::Create(this, turl_model, &profile_);
}
@@ -236,8 +243,9 @@ TEST_F(ZeroSuggestProviderTest, TestMostVisitedCallback) {
provider_->Start(input, false);
EXPECT_TRUE(provider_->matches().empty());
- static_cast<FakeEmptyTopSites*>(profile_.GetTopSites())->mv_callback.Run(
- urls);
+ scoped_refptr<history::TopSites> top_sites =
+ TopSitesFactory::GetForProfile(profile_);
+ static_cast<FakeEmptyTopSites*>(top_sites.get())->mv_callback.Run(urls);
// Should have verbatim match + most visited url match.
EXPECT_EQ(2U, provider_->matches().size());
provider_->Stop(false);
@@ -247,8 +255,7 @@ TEST_F(ZeroSuggestProviderTest, TestMostVisitedCallback) {
EXPECT_TRUE(provider_->matches().empty());
// Most visited results arriving after Stop() has been called, ensure they
// are not displayed.
- static_cast<FakeEmptyTopSites*>(profile_.GetTopSites())->mv_callback.Run(
- urls);
+ static_cast<FakeEmptyTopSites*>(top_sites.get())->mv_callback.Run(urls);
EXPECT_TRUE(provider_->matches().empty());
}
@@ -288,8 +295,9 @@ TEST_F(ZeroSuggestProviderTest, TestMostVisitedNavigateToSearchPage) {
provider_->Start(srp_input, false);
EXPECT_TRUE(provider_->matches().empty());
// Most visited results arriving after a new request has been started.
- static_cast<FakeEmptyTopSites*>(profile_.GetTopSites())->mv_callback.Run(
- urls);
+ scoped_refptr<history::TopSites> top_sites =
+ TopSitesFactory::GetForProfile(profile_);
+ static_cast<FakeEmptyTopSites*>(top_sites.get())->mv_callback.Run(urls);
EXPECT_TRUE(provider_->matches().empty());
}

Powered by Google App Engine
This is Rietveld 408576698