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

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/custom_home_pages_table_model.h"
 #include "chrome/browser/instant/instant_confirm_dialog.h"
 #include "chrome/browser/instant/instant_controller.h"
-#include "chrome/browser/instant/instant_field_trial.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.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/browser/ui/webui/favicon_source.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
@@ skipping 93 matching lines @@
                   &BrowserOptionsHandler::RequestAutocompleteSuggestions));
   web_ui_->RegisterMessageCallback(
       "toggleShowBookmarksBar",
       NewCallback(this, &BrowserOptionsHandler::ToggleShowBookmarksBar));
   web_ui_->RegisterMessageCallback(
       "enableInstant",
       NewCallback(this, &BrowserOptionsHandler::EnableInstant));
   web_ui_->RegisterMessageCallback(
       "disableInstant",
       NewCallback(this, &BrowserOptionsHandler::DisableInstant));
-  web_ui_->RegisterMessageCallback(
-      "getInstantFieldTrialStatus",
-      NewCallback(this, &BrowserOptionsHandler::GetInstantFieldTrialStatus));
 }
 
 void BrowserOptionsHandler::Initialize() {
   Profile* profile = web_ui_->GetProfile();
 
   // Create our favicon data source.
   profile->GetChromeURLDataManager()->AddDataSource(
       new FaviconSource(profile, FaviconSource::FAVICON));
 
   homepage_.Init(prefs::kHomePage, profile->GetPrefs(), NULL);
@@ skipping 335 matching lines @@
 }
 
 void BrowserOptionsHandler::EnableInstant(const ListValue* args) {
   InstantController::Enable(web_ui_->GetProfile());
 }
 
 void BrowserOptionsHandler::DisableInstant(const ListValue* args) {
   InstantController::Disable(web_ui_->GetProfile());
 }
 
-void BrowserOptionsHandler::GetInstantFieldTrialStatus(const ListValue* args) {
-  FundamentalValue enabled(
-      InstantFieldTrial::IsExperimentGroup(web_ui_->GetProfile()));
-  web_ui_->CallJavascriptFunction("BrowserOptions.setInstantFieldTrialStatus",
-                                  enabled);
-}
-
 void BrowserOptionsHandler::OnResultChanged(bool default_match_changed) {
   const AutocompleteResult& result = autocomplete_controller_->result();
   ListValue suggestions;
   for (size_t i = 0; i < result.size(); ++i) {
     const AutocompleteMatch& match = result.match_at(i);
     AutocompleteMatch::Type type = match.type;
     if (type != AutocompleteMatch::HISTORY_URL &&
         type != AutocompleteMatch::HISTORY_TITLE &&
         type != AutocompleteMatch::HISTORY_BODY &&
         type != AutocompleteMatch::HISTORY_KEYWORD &&
         type != AutocompleteMatch::NAVSUGGEST)
       continue;
     DictionaryValue* entry = new DictionaryValue();
     entry->SetString("title", match.description);
     entry->SetString("displayURL", match.contents);
     entry->SetString("url", match.destination_url.spec());
     suggestions.Append(entry);
   }
 
   web_ui_->CallJavascriptFunction(
       "BrowserOptions.updateAutocompleteSuggestions", suggestions);
 }