Prepare HistoryProvider for componentization

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright 2012 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 "components/omnibox/search_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 56 matching lines @@
   while ((it != matches.end()) && !it->allowed_to_be_default_match)
     ++it;
   return it;
 }
 
 class SuggestionDeletionHandler;
 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:
   ~SearchProviderForTest() override;
 
  private:
   void RecordDeletionResult(bool success) override;
   bool is_success_;
   DISALLOW_COPY_AND_ASSIGN(SearchProviderForTest);
 };
 
 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) {
 }
 
 SearchProviderForTest::~SearchProviderForTest() {
 }
 
 void SearchProviderForTest::RecordDeletionResult(bool success) {
   is_success_ = success;
 }
 
@@ skipping 148 matching lines @@
   GURL keyword_url_;
 
   content::TestBrowserThreadBundle thread_bundle_;
 
   // URLFetcherFactory implementation registered.
   net::TestURLFetcherFactory test_factory_;
 
   // 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_;
 
   // If non-NULL, OnProviderUpdate quits the current |run_loop_|.
   base::RunLoop* run_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchProviderTest);
 };
 
 // static
 const std::string SearchProviderTest::kNotApplicable = "Not Applicable";
 const SearchProviderTest::ExpectedMatch
     SearchProviderTest::kEmptyExpectedMatch = { kNotApplicable, false };
 
 void SearchProviderTest::SetUp() {
   // Make sure that fetchers are automatically ungregistered upon destruction.
   test_factory_.set_remove_fetcher_on_delete(true);
 
   // We need both the history service and template url model loaded.
   ASSERT_TRUE(profile_.CreateHistoryService(true, false));
   TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
       &profile_, &TemplateURLServiceFactory::BuildInstanceFor);
 
+  client_.reset(new ChromeAutocompleteProviderClient(&profile_));
+
   TemplateURLService* turl_model =
       TemplateURLServiceFactory::GetForProfile(&profile_);
 
   turl_model->Load();
 
   // Reset the default TemplateURL.
   TemplateURLData data;
   data.SetShortName(ASCIIToUTF16("t"));
   data.SetURL("http://defaultturl/{searchTerms}");
   data.suggestions_url = "http://defaultturl2/{searchTerms}";
@@ skipping 21 matching lines @@
   keyword_url_ = AddSearchToHistory(keyword_t_url_, keyword_term_, 1);
 
   // Keywords are updated by the InMemoryHistoryBackend only after the message
   // has been processed on the history thread. Block until history processes all
   // requests to ensure the InMemoryDatabase is the state we expect it.
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   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;
 }
 
 void SearchProviderTest::TearDown() {
   base::RunLoop().RunUntilIdle();
 
   // Shutdown the provider before the profile.
   provider_ = NULL;
 }
 
@@ skipping 3263 matching lines @@
 
 TEST_F(SearchProviderTest, DoesNotProvideOnFocus) {
   AutocompleteInput input(base::ASCIIToUTF16("f"), base::string16::npos,
                           std::string(), GURL(),
                           metrics::OmniboxEventProto::INVALID_SPEC, false,
                           true, true, true,
                           ChromeAutocompleteSchemeClassifier(&profile_));
   provider_->Start(input, false, true);
   EXPECT_TRUE(provider_->matches().empty());
 }