Centralize logic around Instant modes.

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 a1105828debc8a9c99b0df0ddde1ebf01207c8bd..02efbc69e9296a5f20e0a4c1ebf624ae7945154e 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -17,11 +17,9 @@
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
-#include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
@@ -208,8 +206,7 @@ void SearchProviderTest::QueryForInputAndSetWYTMatch(
   QueryForInput(text, string16(), false);
   profile_.BlockUntilHistoryProcessesPendingRequests();
   ASSERT_NO_FATAL_FAILURE(FinishDefaultSuggestQuery());
-  EXPECT_NE(profile_.GetPrefs()->GetBoolean(prefs::kInstantEnabled),
-            provider_->done());
+  EXPECT_NE(provider_->instant_suggest_enabled(), provider_->done());
   if (!wyt_match)
     return;
   ASSERT_GE(provider_->matches().size(), 1u);
@@ -406,8 +403,7 @@ TEST_F(SearchProviderTest, DontSendPrivateDataToSuggest) {
 
 // Make sure FinalizeInstantQuery works.
 TEST_F(SearchProviderTest, FinalizeInstantQuery) {
-  PrefService* service = profile_.GetPrefs();
-  service->SetBoolean(prefs::kInstantEnabled, true);
+  provider_->set_instant_suggest_enabled(true);
 
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
                                                       NULL));
@@ -444,8 +440,7 @@ TEST_F(SearchProviderTest, FinalizeInstantQuery) {
 // Make sure that if FinalizeInstantQuery is invoked before suggest results
 // return, the suggest text from FinalizeInstantQuery is remembered.
 TEST_F(SearchProviderTest, RememberInstantQuery) {
-  PrefService* service = profile_.GetPrefs();
-  service->SetBoolean(prefs::kInstantEnabled, true);
+  provider_->set_instant_suggest_enabled(true);
 
   QueryForInput(ASCIIToUTF16("foo"), string16(), false);
 
@@ -479,8 +474,7 @@ TEST_F(SearchProviderTest, RememberInstantQuery) {
 // Make sure that if trailing whitespace is added to the text supplied to
 // AutocompleteInput the default suggest text is cleared.
 TEST_F(SearchProviderTest, DifferingText) {
-  PrefService* service = profile_.GetPrefs();
-  service->SetBoolean(prefs::kInstantEnabled, true);
+  provider_->set_instant_suggest_enabled(true);
 
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("foo"),
                                                       NULL));