[AiS] Add disable flag to about_flags.

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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 <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 390 matching lines @@
     extensions::switches::kExtensionContentVerification,
     extensions::switches::kExtensionContentVerificationBootstrap },
   { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE,
     extensions::switches::kExtensionContentVerification,
     extensions::switches::kExtensionContentVerificationEnforce },
   { IDS_FLAGS_EXTENSION_CONTENT_VERIFICATION_ENFORCE_STRICT,
     extensions::switches::kExtensionContentVerification,
     extensions::switches::kExtensionContentVerificationEnforceStrict },
 };
 
+#if defined(OS_ANDROID)
+const Experiment::Choice kAnswersInSuggestChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+    switches::kEnableAnswersInSuggest, ""},
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    switches::kDisableAnswersInSuggest, ""}
+};
+#endif
+
 // Using independent flags (instead of flag=value flags) to be able to
 // associate the version with a FieldTrial. FieldTrials don't currently support
 // flag=value flags.
 const Experiment::Choice kSSLInterstitialVersions[] = {
   { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
   { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V1,
     switches::kSSLInterstitialVersionV1, "" },
   { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_GRAY,
     switches::kSSLInterstitialVersionV2Gray, "" },
   { IDS_FLAGS_SSL_INTERSTITIAL_VERSION_V2_COLORFUL,
@@ skipping 1480 matching lines @@
   },
   {
     "enable-harfbuzz-rendertext",
     IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_NAME,
     IDS_FLAGS_ENABLE_HARFBUZZ_RENDERTEXT_DESCRIPTION,
     kOsDesktop,
     SINGLE_VALUE_TYPE(switches::kEnableHarfBuzzRenderText)
   },
 #if defined(OS_ANDROID)
   {
-    "enable-answers-in-suggest",
+    "answers-in-suggest",
     IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_NAME,
     IDS_FLAGS_ENABLE_ANSWERS_IN_SUGGEST_DESCRIPTION,
     kOsAndroid,
-    SINGLE_VALUE_TYPE(switches::kEnableAnswersInSuggest)
+    MULTI_VALUE_TYPE(kAnswersInSuggestChoices)
   },
 #endif
   {
     "ssl-interstitial-version",
     IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_NAME,
     IDS_FLAGS_SSL_INTERSTITIAL_TRIAL_DESCRIPTION,
     kOsAll,
     MULTI_VALUE_TYPE(kSSLInterstitialVersions)
   },
   {
@@ skipping 535 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags