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

ui/base/touch/touch_device_android.cc

Index: ui/base/touch/touch_device_android.cc
diff --git a/ui/base/touch/touch_device_android.cc b/ui/base/touch/touch_device_android.cc
index b8a458e8300467d6cd711fc4745f9cb7cf19f578..fdb4a82f5b653bdf82303660bfd921833ae39b5a 100644
--- a/ui/base/touch/touch_device_android.cc
+++ b/ui/base/touch/touch_device_android.cc
@@ -45,12 +45,10 @@ PointerType GetPrimaryPointerType(int available_pointer_types) {
 }
 
 HoverType GetPrimaryHoverType(int available_hover_types) {
-  if (available_hover_types & HOVER_TYPE_ON_DEMAND)
-    return HOVER_TYPE_ON_DEMAND;
-  if (available_hover_types & HOVER_TYPE_HOVER)
-    return HOVER_TYPE_HOVER;
-  DCHECK_EQ(available_hover_types, HOVER_TYPE_NONE);
-  return HOVER_TYPE_NONE;
+  if (available_hover_types & HOVER_TYPE_NONE)
+    return HOVER_TYPE_NONE;
+  DCHECK_EQ(available_hover_types, HOVER_TYPE_HOVER);
+  return HOVER_TYPE_HOVER;
 }
 
 }  // namespace ui