Revert 94073 (broke a ton of tests) - Introduce a field trial for Instant.

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/autocomplete/search_provider.h"
 
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 135 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();
 
   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) {
   if (quit_when_done_ && provider_->done()) {
     quit_when_done_ = false;
     message_loop_.Quit();
   }
 }
 
 void SearchProviderTest::RunTillProviderDone() {
@@ skipping 450 matching lines @@
 
 // Verifies AutocompleteControllers sets descriptions for results correctly.
 TEST_F(SearchProviderTest, UpdateKeywordDescriptions) {
   // Add an entry that corresponds to a keyword search with 'term2'.
   AddSearchToHistory(keyword_t_url_, ASCIIToUTF16("term2"), 1);
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   ACProviders providers;
   SearchProvider* provider = provider_.release();
   providers.push_back(provider);
-  AutocompleteController controller(providers, &profile_);
+  AutocompleteController controller(providers);
   controller.set_search_provider(provider);
   provider->set_listener(&controller);
   controller.Start(ASCIIToUTF16("k t"), string16(), false, false, true,
                    AutocompleteInput::ALL_MATCHES);
   const AutocompleteResult& result = controller.result();
 
   // There should be two matches, one for the keyword one for what you typed.
   ASSERT_EQ(2u, result.size());
 
   EXPECT_TRUE(result.match_at(0).template_url != NULL);
   EXPECT_TRUE(result.match_at(1).template_url != NULL);
   EXPECT_NE(result.match_at(0).template_url,
             result.match_at(1).template_url);
 
   EXPECT_FALSE(result.match_at(0).description.empty());
   EXPECT_FALSE(result.match_at(1).description.empty());
   EXPECT_NE(result.match_at(0).description,
             result.match_at(1).description);
 }