Fix NULL dereference in SearchProviderTest

BUG=407750
TEST=unit_tests

Review URL: https://codereview.chromium.org/511753002

Cr-Commit-Position: refs/heads/master@{#292116}

2 files changed, 8 insertions, 5 deletions

diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc
index 87f2465..e99e16c 100644
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc
@@ -58,9 +58,11 @@ void ChromeAutocompleteProviderDelegate::Classify(
     metrics::OmniboxEventProto::PageClassification page_classification,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) {
-  AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(
-      text, prefer_keyword, allow_exact_keyword_match, page_classification,
-      match, alternate_nav_url);
+  AutocompleteClassifier* classifier =
+      AutocompleteClassifierFactory::GetForProfile(profile_);
+  DCHECK(classifier);
+  classifier->Classify(text, prefer_keyword, allow_exact_keyword_match,
+                       page_classification, match, alternate_nav_url);
 }
 
 history::URLDatabase* ChromeAutocompleteProviderDelegate::InMemoryDatabase() {
diff --git a/chrome/browser/autocomplete/search_provider_unittest.cc b/chrome/browser/autocomplete/search_provider_unittest.cc
index 9432ac8..5742649 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -292,6 +292,9 @@ void SearchProviderTest::SetUp() {
   // 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_->kMinimumTimeBetweenSuggestQueriesMs = 0;
 }
@@ -661,8 +664,6 @@ TEST_F(SearchProviderTest, SendNonPrivateDataToSuggest) {
 }
 
 TEST_F(SearchProviderTest, DontAutocompleteURLLikeTerms) {
-  AutocompleteClassifierFactory::GetInstance()->SetTestingFactoryAndUse(
-      &profile_, &AutocompleteClassifierFactory::BuildInstanceFor);
   GURL url = AddSearchToHistory(default_t_url_,
                                 ASCIIToUTF16("docs.google.com"), 1);