Manual revert of r245345 in branch 1847

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 <algorithm>
 #include <iterator>
 #include <map>
 #include <set>
@@ skipping 1740 matching lines @@
   },
 #endif
   {
     "enable-app-list-folder",
     IDS_FLAGS_ENABLE_APP_LIST_FOLDER,
     IDS_FLAGS_ENABLE_APP_LIST_FOLDER_DESCRIPTION,
     kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kEnableFolderUI)
   },
   {
-    "disable-app-list-voice-search",
-    IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH,
-    IDS_FLAGS_DISABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
+    "enable-app-list-voice-search",
+    IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH,
+    IDS_FLAGS_ENABLE_APP_LIST_VOICE_SEARCH_DESCRIPTION,
     kOsCrOS,
-    SINGLE_VALUE_TYPE(app_list::switches::kDisableVoiceSearch)
+    SINGLE_VALUE_TYPE(app_list::switches::kEnableVoiceSearch)
   },
   {
     "enable-app-list-app-info",
     IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST,
     IDS_FLAGS_ENABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
     kOsLinux | kOsWin | kOsCrOS,
     SINGLE_VALUE_TYPE(app_list::switches::kEnableAppInfo)
   },
 #endif
 #if defined(OS_CHROMEOS)
@@ skipping 760 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags