Articulate the cancel behavior in the WebTouchEvent.

content/browser/renderer_host/input/touch_emulator_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/input/touch_emulator.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
@@ skipping 45 matching lines @@
   void ForwardEmulatedGestureEvent(
       const blink::WebGestureEvent& event) override {
     forwarded_events_.push_back(event.type);
   }
 
   void ForwardEmulatedTouchEvent(const blink::WebTouchEvent& event) override {
     forwarded_events_.push_back(event.type);
     EXPECT_EQ(1U, event.touchesLength);
     EXPECT_EQ(last_mouse_x_, event.touches[0].position.x);
     EXPECT_EQ(last_mouse_y_, event.touches[0].position.y);
-    bool expected_cancelable = event.type != WebInputEvent::TouchCancel;
-    EXPECT_EQ(expected_cancelable, !!event.cancelable);
+    WebInputEvent::DispatchType expected_cancelable =

[tdresser, 2016/04/18 15:12:02]

Rename to expected_dispatch_type

[dtapuska, 2016/04/18 19:19:33]

Done.

+        event.type == WebInputEvent::TouchCancel ? WebInputEvent::NonBlocking
+                                                 : WebInputEvent::Blocking;
+    EXPECT_EQ(expected_cancelable, event.dispatchType);
     if (ack_touches_synchronously_) {
       emulator()->HandleTouchEventAck(
           event, INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS);
     }
   }
 
   void SetCursor(const WebCursor& cursor) override {}
 
   void ShowContextMenuAtPoint(const gfx::Point& point) override {}
 
@@ skipping 478 matching lines @@
   emulator()->Disable();
   EXPECT_EQ("TouchStart TouchCancel", ExpectedEvents());
   emulator()->CancelTouch();
 }
 
 TEST_F(TouchEmulatorTest, ConstructorWithHighDeviceScaleDoesNotCrash) {
   TouchEmulator(this, 4.0f);
 }
 
 }  // namespace content