| Index: third_party/WebKit/Source/web/DevToolsEmulator.cpp | 
| diff --git a/third_party/WebKit/Source/web/DevToolsEmulator.cpp b/third_party/WebKit/Source/web/DevToolsEmulator.cpp | 
| index 65527e56ad5d310e46ec8ec76ea516648561ba8c..1d33bea9aeb7eb7194c0c22a783f4460760a5865 100644 | 
| --- a/third_party/WebKit/Source/web/DevToolsEmulator.cpp | 
| +++ b/third_party/WebKit/Source/web/DevToolsEmulator.cpp | 
| @@ -89,7 +89,7 @@ DevToolsEmulator::DevToolsEmulator(WebViewImpl* webViewImpl) | 
| .mainFrameResizesAreOrientationChanges()), | 
| m_touchEventEmulationEnabled(false), | 
| m_doubleTapToZoomEnabled(false), | 
| -      m_originalTouchEnabled(false), | 
| +      m_originalTouchEventAPIEnabled(false), | 
| m_originalDeviceSupportsMouse(false), | 
| m_originalDeviceSupportsTouch(false), | 
| m_originalMaxTouchPoints(0), | 
| @@ -446,7 +446,8 @@ void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled) { | 
| if (m_touchEventEmulationEnabled == enabled) | 
| return; | 
| if (!m_touchEventEmulationEnabled) { | 
| -    m_originalTouchEnabled = RuntimeEnabledFeatures::touchEnabled(); | 
| +    m_originalTouchEventAPIEnabled = | 
| +        RuntimeEnabledFeatures::touchEventAPIEnabled(); | 
| m_originalDeviceSupportsMouse = | 
| m_webViewImpl->page()->settings().deviceSupportsMouse(); | 
| m_originalDeviceSupportsTouch = | 
| @@ -454,8 +455,8 @@ void DevToolsEmulator::setTouchEventEmulationEnabled(bool enabled) { | 
| m_originalMaxTouchPoints = | 
| m_webViewImpl->page()->settings().maxTouchPoints(); | 
| } | 
| -  RuntimeEnabledFeatures::setTouchEnabled(enabled ? true | 
| -                                                  : m_originalTouchEnabled); | 
| +  RuntimeEnabledFeatures::setTouchEventAPIEnabled( | 
| +      enabled ? true : m_originalTouchEventAPIEnabled); | 
| if (!m_originalDeviceSupportsTouch) { | 
| m_webViewImpl->page()->settings().setDeviceSupportsMouse( | 
| enabled ? false : m_originalDeviceSupportsMouse); | 
|  |