Removes different instant behaviors that are no longer used.

chrome/browser/about_flags.cc

 // Copyright (c) 2010 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/about_flags.h"
 
 #include <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 20 matching lines @@
 namespace {
 
 const unsigned kOsAll = kOsMac | kOsWin | kOsLinux | kOsCrOS;
 
 // Names for former Chrome OS Labs experiments, shared with prefs migration
 // code.
 const char kMediaPlayerExperimentName[] = "media-player";
 const char kAdvancedFileSystemExperimentName[] = "advanced-file-system";
 const char kVerticalTabsExperimentName[] = "vertical-tabs";
 
-// If adding a new choice, add it to the end of the list.
-const Experiment::Choice kInstantChoices[] = {
-  { IDS_FLAGS_INSTANT_TYPE_VERBATIM, switches::kEnableVerbatimInstant },
-  { IDS_FLAGS_INSTANT_TYPE_PREDICTIVE, switches::kEnablePredictiveInstant },
-  { IDS_FLAGS_INSTANT_TYPE_PREDICTIVE_NO_AUTO_COMPLETE,
-    switches::kEnablePredictiveNoAutoCompleteInstant
-  },
-};
-
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run //chrome/tools/extract_actions.py (see instructions at
 // the top of that file for details) to update the chromeactions.txt file, which
 // will enable UMA to record your feature flag.
@@ skipping 184 matching lines @@
     SINGLE_VALUE_TYPE(switches::kNoPings)
   },
   {
     "experimental-location-features",  // FLAGS:RECORD_UMA
     IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_NAME,
     IDS_FLAGS_EXPERIMENTAL_LOCATION_FEATURES_DESCRIPTION,
     kOsMac | kOsWin | kOsLinux,  // Currently does nothing on CrOS.
     SINGLE_VALUE_TYPE(switches::kExperimentalLocationFeatures)
   },
   {
-    "instant-type",  // FLAGS:RECORD_UMA
-    IDS_FLAGS_INSTANT_TYPE_NAME,
-    IDS_FLAGS_INSTANT_TYPE_DESCRIPTION,
-    kOsWin,
-    MULTI_VALUE_TYPE(kInstantChoices)
-  },
-  {
     "instant-autocomplete-immediately",  // FLAGS:RECORD_UMA
     IDS_FLAGS_INSTANT_AUTOCOMPLETE_IMMEDIATELY_NAME,
     IDS_FLAGS_INSTANT_AUTOCOMPLETE_IMMEDIATELY_DESCRIPTION,
     kOsWin | kOsLinux,
     SINGLE_VALUE_TYPE(switches::kInstantAutocompleteImmediately)
   },
   {
     "block-reading-third-party-cookies",
     IDS_FLAGS_BLOCK_ALL_THIRD_PARTY_COOKIES_NAME,
     IDS_FLAGS_BLOCK_ALL_THIRD_PARTY_COOKIES_DESCRIPTION,
@@ skipping 400 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags