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

third_party/WebKit/Source/core/testing/InternalSettings.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 439 matching lines @@
   // ("on-demand,none").
   Vector<String> tokens;
   types.split(",", false, tokens);
 
   int hoverTypes = 0;
   for (size_t i = 0; i < tokens.size(); ++i) {
     String token = tokens[i].stripWhiteSpace();
 
     if (token == "none")
       hoverTypes |= HoverTypeNone;
-    else if (token == "on-demand")
-      hoverTypes |= HoverTypeOnDemand;
     else if (token == "hover")
       hoverTypes |= HoverTypeHover;
     else
       exceptionState.throwDOMException(
           SyntaxError, "The hover type token ('" + token + ")' is invalid.");
   }
 
   settings()->setAvailableHoverTypes(hoverTypes);
 }
 
 void InternalSettings::setPrimaryHoverType(const String& type,
                                            ExceptionState& exceptionState) {
   InternalSettingsGuardForSettings();
   String token = type.stripWhiteSpace();
 
   HoverType hoverType = HoverTypeNone;
   if (token == "none")
     hoverType = HoverTypeNone;
-  else if (token == "on-demand")
-    hoverType = HoverTypeOnDemand;
   else if (token == "hover")
     hoverType = HoverTypeHover;
   else
     exceptionState.throwDOMException(
         SyntaxError, "The hover type token ('" + token + ")' is invalid.");
 
   settings()->setPrimaryHoverType(hoverType);
 }
 
 void InternalSettings::setImageAnimationPolicy(const String& policy,
@@ skipping 34 matching lines @@
   RuntimeEnabledFeatures::setCompositorWorkerEnabled(enabled);
 }
 
 void InternalSettings::setPresentationReceiver(bool enabled,
                                                ExceptionState& exceptionState) {
   InternalSettingsGuardForSettings();
   settings()->setPresentationReceiver(enabled);
 }
 
 }  // namespace blink