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..4f9e16ee792ce28eae8743f2f6d1d8ee0da1b4e1 100644 |
--- a/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc |
+++ b/chrome/browser/autocomplete/zero_suggest_provider_unittest.cc |
@@ -174,8 +174,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()); |
+ scoped_refptr<history::TopSites> top_sites = new FakeEmptyTopSites(); |
+ profile_.CreateTopSitesService(top_sites.get()); |
provider_ = ZeroSuggestProvider::Create(this, turl_model, &profile_); |
} |
@@ -236,8 +236,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 = |
+ TopSitesServiceFactory::GetForProfile(profile_); |
+ static_cast<FakeEmptyTopSites*>(top_sites)->mv_callback.Run(urls); |
sdefresne
2014/12/29 09:48:14
nit: "static_cast<FakeEmptyTopSites*>(top_sites.ge
Jitu( very slow this week)
2014/12/30 10:09:03
Done.
|
// Should have verbatim match + most visited url match. |
EXPECT_EQ(2U, provider_->matches().size()); |
provider_->Stop(false); |
@@ -247,8 +248,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)->mv_callback.Run(urls); |
EXPECT_TRUE(provider_->matches().empty()); |
} |
@@ -288,8 +288,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 = |
+ TopSitesServiceFactory::GetForProfile(profile_); |
+ static_cast<FakeEmptyTopSites*>(top_sites)->mv_callback.Run(urls); |
EXPECT_TRUE(provider_->matches().empty()); |
} |