Drop hover:on-demand support & let touch-screens report "none" instead.

ui/android/java/src/org/chromium/ui/base/TouchDevice.java

Index: ui/android/java/src/org/chromium/ui/base/TouchDevice.java
diff --git a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
index 86d6a1358d82430501aaf8e4fdb57acb1e14dfec..a9cfb27dd757bcc26aa433d92d37b689acd30b5d 100644
--- a/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
+++ b/ui/android/java/src/org/chromium/ui/base/TouchDevice.java
@@ -49,10 +49,9 @@ public class TouchDevice {
     }
 
     /**
-     * @return the pointer-types supported by the device, as the union (bitwise OR) of PointerType
-     *         bits in result[0]
-     *         the hover-types supported by the device, as the union (bitwise OR) of HoverType bits
-     *         in result[1].
+     * @return an array of two ints: result[0] represents the pointer-types and result[1] represents
+     *         the hover-types supported by the device, where each int is the union (bitwise OR) of
+     *         corresponding type (PointerType/HoverType) bits.
      */
     @CalledByNative
     private static int[] availablePointerAndHoverTypes(Context context) {
@@ -78,9 +77,6 @@ public class TouchDevice {
                     || hasSource(sources, InputDevice.SOURCE_TOUCHPAD)
                     || hasSource(sources, InputDevice.SOURCE_TRACKBALL)) {
                 result[1] |= HoverType.HOVER;
-            } else if (hasSource(sources, InputDevice.SOURCE_STYLUS)
-                    || hasSource(sources, InputDevice.SOURCE_TOUCHSCREEN)) {
-                result[1] |= HoverType.ON_DEMAND;
             }
 
             // Remaining InputDevice sources: SOURCE_DPAD, SOURCE_GAMEPAD, SOURCE_JOYSTICK,