Prepare HistoryProvider for componentization

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index e577589de7bf468c6c319fc16178d1f1585a0f7d..ed6b8ce5d244fce41568dc8b8b26dd9464f2b160 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -74,7 +74,8 @@ class SearchProviderForTest : public SearchProvider {
  public:
   SearchProviderForTest(AutocompleteProviderListener* listener,
                         TemplateURLService* template_url_service,
-                        Profile* profile);
+                        Profile* profile,
+                        ChromeAutocompleteProviderClient* client);
   bool is_success() { return is_success_; }
 
  protected:
@@ -89,10 +90,9 @@ class SearchProviderForTest : public SearchProvider {
 SearchProviderForTest::SearchProviderForTest(
     AutocompleteProviderListener* listener,
     TemplateURLService* template_url_service,
-    Profile* profile)
-    : SearchProvider(listener, template_url_service,
-                     scoped_ptr<AutocompleteProviderClient>(
-                         new ChromeAutocompleteProviderClient(profile))),
+    Profile* profile,
+    ChromeAutocompleteProviderClient* client)
+    : SearchProvider(listener, template_url_service, client),
       is_success_(false) {
 }
 
@@ -261,6 +261,9 @@ class SearchProviderTest : public testing::Test,
   // Profile we use.
   TestingProfile profile_;
 
+  // The provider client.

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

Nit: This comment, as well as the similar ones nearby, don't add anything to the
code, and I'd remove them (and the blank lines between these).

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

Done.

+  scoped_ptr<ChromeAutocompleteProviderClient> client_;
+
   // The provider.
   scoped_refptr<SearchProviderForTest> provider_;
 
@@ -284,6 +287,8 @@ void SearchProviderTest::SetUp() {
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &TemplateURLServiceFactory::BuildInstanceFor);
 
+  client_.reset(new ChromeAutocompleteProviderClient(&profile_));
+
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
 
@@ -325,7 +330,8 @@ void SearchProviderTest::SetUp() {
   AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
 
-  provider_ = new SearchProviderForTest(this, turl_model, &profile_);
+  provider_ =
+      new SearchProviderForTest(this, turl_model, &profile_, client_.get());
   OmniboxFieldTrial::kDefaultMinimumTimeBetweenSuggestQueriesMs = 0;
 }