Prepare HistoryProvider for componentization

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"
 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
+#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.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"
 #include "components/history/core/browser/top_sites.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_provider_listener.h"
 #include "components/omnibox/omnibox_field_trial.h"
 #include "components/search_engines/template_url.h"
@@ skipping 119 matching lines @@
 
   // Needed for OmniboxFieldTrial::ActivateStaticTrials().
   scoped_ptr<base::FieldTrialList> field_trial_list_;
 
   // URLFetcherFactory implementation registered.
   net::TestURLFetcherFactory test_factory_;
 
   // Profile we use.
   TestingProfile profile_;
 
+  // ProviderClient we use.

[Peter Kasting, 2015/06/16 00:03:42]

Nit: Same comment as in search_provider_unittest.cc.

[blundell, 2015/06/16 07:21:25]

Done.

+  scoped_ptr<ChromeAutocompleteProviderClient> client_;
+
   // ZeroSuggestProvider object under test.
   scoped_refptr<ZeroSuggestProvider> provider_;
 
   // Default template URL.
   TemplateURL* default_t_url_;
 };
 
 ZeroSuggestProviderTest::ZeroSuggestProviderTest() {
   ResetFieldTrialList();
 }
 
 void ZeroSuggestProviderTest::SetUp() {
   // Make sure that fetchers are automatically ungregistered upon destruction.
   test_factory_.set_remove_fetcher_on_delete(true);
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &TemplateURLServiceFactory::BuildInstanceFor);
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
 
+  client_.reset(new ChromeAutocompleteProviderClient(&profile_));
+
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
   turl_model->Load();
 
   TemplateURLData data;
   data.SetShortName(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_);
 
   TopSitesFactory* top_sites_factory = TopSitesFactory::GetInstance();
   top_sites_factory->SetTestingFactory(&profile_, BuildFakeEmptyTopSites);
-  provider_ = ZeroSuggestProvider::Create(this, turl_model, &profile_);
+  provider_ =
+      ZeroSuggestProvider::Create(this, turl_model, &profile_, client_.get());
 }
 
 void ZeroSuggestProviderTest::TearDown() {
   // Shutdown the provider before the profile.
   provider_ = NULL;
 }
 
 void ZeroSuggestProviderTest::OnProviderUpdate(bool updated_matches) {
 }
 
@@ skipping 246 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));
 }