Topsites become keyedService based.

chrome/browser/autocomplete/zero_suggest_provider_unittest.cc

 // Copyright 2014 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 "chrome/browser/autocomplete/zero_suggest_provider.h"
 
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 156 matching lines @@
 
   TemplateURLData data;
   data.short_name = base::ASCIIToUTF16("t");
   data.SetURL("https://www.google.com/?q={searchTerms}");
   data.suggestions_url = "https://www.google.com/complete/?q={searchTerms}";
   data.instant_url = "https://does/not/exist?strk=1";
   data.search_terms_replacement_key = "strk";
   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_);
 }
 
 void ZeroSuggestProviderTest::TearDown() {
   // Shutdown the provider before the profile.
   provider_ = NULL;
 }
 
 void ZeroSuggestProviderTest::OnProviderUpdate(bool updated_matches) {
@@ skipping 40 matching lines @@
                           metrics::OmniboxEventProto::OTHER, false, false,
                           true, true,
                           ChromeAutocompleteSchemeClassifier(&profile_));
   history::MostVisitedURLList urls;
   history::MostVisitedURL url(GURL("http://foo.com/"),
                               base::ASCIIToUTF16("Foo"));
   urls.push_back(url);
 
   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.get())" here and everywhere
else.

[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);
 
   provider_->Start(input, false);
   provider_->Stop(false);
   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());
 }
 
 TEST_F(ZeroSuggestProviderTest, TestMostVisitedNavigateToSearchPage) {
   CreateMostVisitedFieldTrial();
 
   std::string current_url("http://www.foxnews.com/");
   std::string input_url("http://www.cnn.com/");
   AutocompleteInput input(base::ASCIIToUTF16(input_url), base::string16::npos,
                           std::string(), GURL(current_url),
@@ skipping 19 matching lines @@
           SEARCH_RESULT_PAGE_DOING_SEARCH_TERM_REPLACEMENT,
       false,
       false,
       true,
       true,
       ChromeAutocompleteSchemeClassifier(&profile_));
 
   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());
 }
 
 TEST_F(ZeroSuggestProviderTest, TestPsuggestZeroSuggestCachingFirstRun) {
   CreatePersonalizedFieldTrial();
 
   // Ensure the cache is empty.
   PrefService* prefs = profile_.GetPrefs();
   prefs->SetString(prefs::kZeroSuggestCachedResults, std::string());
 
@@ skipping 105 matching lines @@
 
   base::RunLoop().RunUntilIdle();
 
   // Expect that the matches have been cleared.
   ASSERT_TRUE(provider_->matches().empty());
 
   // Expect the new results have been stored.
   EXPECT_EQ(empty_response,
             prefs->GetString(prefs::kZeroSuggestCachedResults));
 }