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

chrome/browser/resources/options/browser_options.js

Index: chrome/browser/resources/options/browser_options.js
===================================================================
--- chrome/browser/resources/options/browser_options.js	(revision 94076)
+++ chrome/browser/resources/options/browser_options.js	(working copy)
@@ -83,18 +83,9 @@
         return true;
       };
 
-      $('instantFieldTrialCheckbox').addEventListener('change',
-          function(event) {
-            this.checked = true;
-            chrome.send('disableInstant');
-          });
-
       Preferences.getInstance().addEventListener('instant.confirm_dialog_shown',
           this.onInstantConfirmDialogShownChanged_.bind(this));
 
-      Preferences.getInstance().addEventListener('instant.enabled',
-          this.onInstantEnabledChanged_.bind(this));
-
       var homepageField = $('homepageURL');
       $('homepageUseNTPButton').onchange =
           this.handleHomepageUseNTPButtonChange_.bind(this);
@@ -178,26 +169,6 @@
     },
 
     /**
-     * Called when the value of the instant.enabled preference changes. Request
-     * the state of the Instant field trial experiment.
-     * @param {Event} event Change event.
-     * @private
-     */
-    onInstantEnabledChanged_: function(event) {
-      chrome.send('getInstantFieldTrialStatus');
-    },
-
-    /**
-     * Called to set the Instant field trial status.
-     * @param {boolean} enabled If true, the experiment is enabled.
-     * @private
-     */
-    setInstantFieldTrialStatus_: function(enabled) {
-      $('instantEnabledCheckbox').hidden = enabled;
-      $('instantFieldTrialCheckbox').hidden = !enabled;
-    },
-
-    /**
      * Update the Default Browsers section based on the current state.
      * @param {string} statusString Description of the current default state.
      * @param {boolean} isDefault Whether or not the browser is currently
@@ -518,10 +489,6 @@
     BrowserOptions.getInstance().updateAutocompleteSuggestions_(suggestions);
   };
 
-  BrowserOptions.setInstantFieldTrialStatus = function(enabled) {
-    BrowserOptions.getInstance().setInstantFieldTrialStatus_(enabled);
-  };
-
   // Export
   return {
     BrowserOptions: BrowserOptions