Revert 281908 "Revert of Remove disable-app-list-voice-search fl..."

Revert reason:
- the change seems okay, the compile error is caused because
  the builder doesn't recomile about_flags. Clobber might fix the
  issue.
- this should be reverted again if it still causes the error
  after clobber.

> Revert of Remove disable-app-list-voice-search flag. (https://codereview.chromium.org/353793003/)
> 
> Reason for revert:
> Caused compile error on Blink GPU Mac Builder:
> http://build.chromium.org/p/chromium.webkit/builders/GPU%20Mac%20Builder
> 
> Original issue's description:
> > Remove disable-app-list-voice-search flag.
> > 
> > BUG=367341
> > R=xiyuan@chromium.org
> > TEST=compile
> > 
> > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281904
> 
> TBR=xiyuan@chromium.org,mukai@chromium.org
> NOTREECHECKS=true
> NOTRY=true
> BUG=367341
> 
> Review URL: https://codereview.chromium.org/379673003

TBR=yutak@chromium.org

Review URL: https://codereview.chromium.org/374293003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281923 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 5 deletions

diff --git a/ui/app_list/app_list_switches.cc b/ui/app_list/app_list_switches.cc
index 4e9ebf3..d0c77d2 100644
--- a/ui/app_list/app_list_switches.cc
+++ b/ui/app_list/app_list_switches.cc
@@ -15,9 +15,6 @@ const char kDisableAppInfo[] = "disable-app-list-app-info";
 // Disables syncing of the app list independent of extensions.
 const char kDisableSyncAppList[] = "disable-sync-app-list";
 
-// If set, the voice search is disabled in app list UI.
-const char kDisableVoiceSearch[] = "disable-app-list-voice-search";
-
 // If set, the app list will be centered and wide instead of tall.
 const char kEnableCenteredAppList[] = "enable-centered-app-list";
 
@@ -51,7 +48,7 @@ bool IsFolderUIEnabled() {
 bool IsVoiceSearchEnabled() {
   // Speech recognition in AppList is only for ChromeOS right now.
 #if defined(OS_CHROMEOS)
-  return !CommandLine::ForCurrentProcess()->HasSwitch(kDisableVoiceSearch);
+  return true;
 #else
   return false;
 #endif
diff --git a/ui/app_list/app_list_switches.h b/ui/app_list/app_list_switches.h
index cb39ad6..d984bb9 100644
--- a/ui/app_list/app_list_switches.h
+++ b/ui/app_list/app_list_switches.h
@@ -13,7 +13,6 @@ namespace switches {
 // Please keep these flags sorted.
 APP_LIST_EXPORT extern const char kDisableAppInfo[];
 APP_LIST_EXPORT extern const char kDisableSyncAppList[];
-APP_LIST_EXPORT extern const char kDisableVoiceSearch[];
 APP_LIST_EXPORT extern const char kEnableCenteredAppList[];
 APP_LIST_EXPORT extern const char kEnableDriveAppsInAppList[];
 APP_LIST_EXPORT extern const char kEnableExperimentalAppList[];