Revert 137549 because it broke win_aura and linux_chromeos_clang compile.

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 707 matching lines @@
     SINGLE_VALUE_TYPE(ash::switches::kEnableAppListV2),
   },
   {
     "show-launcher-alignment-menu",
     IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_NAME,
     IDS_FLAGS_SHOW_LAUNCHER_ALIGNMENT_MENU_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(switches::kShowLauncherAlignmentMenu)
   },
   {
-    "show-touch-hud",
-    IDS_FLAGS_SHOW_TOUCH_HUD_NAME,
-    IDS_FLAGS_SHOW_TOUCH_HUD_DESCRIPTION,
-    kOsAll,
-    SINGLE_VALUE_TYPE(ash::switches::kAshTouchHud)
-  },
-  {
     "ash-notify",
     IDS_FLAGS_ENABLE_ASH_NOTIFY_NAME,
     IDS_FLAGS_ENABLE_ASH_NOTIFY_DESCRIPTION,
     kOsAll,
     SINGLE_VALUE_TYPE(ash::switches::kAshNotify),
   },
-#endif  // defined(USE_ASH)
+#endif
 };
 
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
 class FlagsState {
  public:
   FlagsState() : needs_restart_(false) {}
   void ConvertFlagsToSwitches(PrefService* prefs, CommandLine* command_line);
@@ skipping 415 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags