Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(919)

Unified Diff: chrome/browser/autocomplete/search_provider_unittest.cc

Issue 7337007: Introduce a field trial for Instant. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Reverting ifdef'ed constructor Created 9 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_unittest.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 99b07e0355dcdd852bea1dfe1cfd1d665678d6c8..2f5a3a98125b8f8e52ed24f9f22f6fbb93c65290 100644
--- a/chrome/browser/autocomplete/search_provider_unittest.cc
+++ b/chrome/browser/autocomplete/search_provider_unittest.cc
@@ -153,6 +153,10 @@ void SearchProviderTest::SetUp() {
provider_ = new SearchProvider(this, &profile_);
URLFetcher::set_factory(&test_factory_);
+
+ // Prevent the Instant field trial from kicking in.
+ PrefService* service = profile_.GetPrefs();
+ service->SetBoolean(prefs::kInstantEnabledOnce, true);
}
void SearchProviderTest::OnProviderUpdate(bool updated_matches) {
@@ -623,7 +627,7 @@ TEST_F(SearchProviderTest, UpdateKeywordDescriptions) {
ACProviders providers;
SearchProvider* provider = provider_.release();
providers.push_back(provider);
- AutocompleteController controller(providers);
+ AutocompleteController controller(providers, &profile_);
controller.set_search_provider(provider);
provider->set_listener(&controller);
controller.Start(ASCIIToUTF16("k t"), string16(), false, false, true,
« no previous file with comments | « chrome/browser/autocomplete/autocomplete_unittest.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698