Fix a regression in checking the status of the touch events.

ui/events/base_event_utils.h

Index: ui/events/base_event_utils.h
diff --git a/ui/events/base_event_utils.h b/ui/events/base_event_utils.h
index f6595801b6fdd6889babb73591405f0547fb9735..2334382dcfa5eeab3d8350f60022b039e06a211d 100644
--- a/ui/events/base_event_utils.h
+++ b/ui/events/base_event_utils.h
@@ -17,15 +17,12 @@ EVENTS_BASE_EXPORT uint32 GetNextTouchEventId();
 // Checks if |flags| contains system key modifiers.
 EVENTS_BASE_EXPORT bool IsSystemKeyModifier(int flags);
 
-#if defined(OS_CHROMEOS)
-// Sets the status of touch events to |enabled| on ChromeOS only. Non-ChromeOS
-// platforms depend on the state of the |kTouchEvents| flags.
-EVENTS_BASE_EXPORT void SetTouchEventsEnabled(bool enabled);
-#endif  // defined(OS_CHROMEOS)
-
-// Returns true if the touch events are enabled. On non-ChromeOS platforms, this
-// depends on the state of the |kTouchEvents| flags.
-EVENTS_BASE_EXPORT bool AreTouchEventsEnabled();
+#if defined(OS_CHROMEOS) && defined(USE_X11)
+// On ChromeOS X11, touch events can be turned off completely using a debug
+// accelerator using the following functions.
+EVENTS_BASE_EXPORT void SetTouchEventsCrOsX11MasterSwitch(bool enabled);
+EVENTS_BASE_EXPORT bool GetTouchEventsCrOsX11MasterSwitch();
+#endif  // defined(OS_CHROMEOS) && defined(USE_X11)
 
 }  // namespace ui