| Index: content/browser/renderer_host/input/input_router_unittest.h
|
| diff --git a/content/browser/renderer_host/input/input_router_unittest.h b/content/browser/renderer_host/input/input_router_unittest.h
|
| index bd1e6f4795130e77928887ec0bfe316a47a9b34a..50c8184a4e473b65a6b719e19b685043f75d2d7b 100644
|
| --- a/content/browser/renderer_host/input/input_router_unittest.h
|
| +++ b/content/browser/renderer_host/input/input_router_unittest.h
|
| @@ -36,16 +36,16 @@ class InputRouterTest : public testing::Test {
|
| virtual void SetUp() OVERRIDE;
|
| virtual void TearDown() OVERRIDE;
|
|
|
| - void SendInputEventACK(WebKit::WebInputEvent::Type type,
|
| + void SendInputEventACK(blink::WebInputEvent::Type type,
|
| InputEventAckState ack_result);
|
| - void SimulateKeyboardEvent(WebKit::WebInputEvent::Type type,
|
| + void SimulateKeyboardEvent(blink::WebInputEvent::Type type,
|
| bool is_shortcut);
|
| void SimulateWheelEvent(float dX, float dY, int modifiers, bool precise);
|
| void SimulateMouseMove(int x, int y, int modifiers);
|
| - void SimulateWheelEventWithPhase(WebKit::WebMouseWheelEvent::Phase phase);
|
| - void SimulateGestureEvent(const WebKit::WebGestureEvent& event);
|
| - void SimulateGestureEvent(WebKit::WebInputEvent::Type type,
|
| - WebKit::WebGestureEvent::SourceDevice sourceDevice);
|
| + void SimulateWheelEventWithPhase(blink::WebMouseWheelEvent::Phase phase);
|
| + void SimulateGestureEvent(const blink::WebGestureEvent& event);
|
| + void SimulateGestureEvent(blink::WebInputEvent::Type type,
|
| + blink::WebGestureEvent::SourceDevice sourceDevice);
|
| void SimulateGestureScrollUpdateEvent(float dX, float dY, int modifiers);
|
| void SimulateGesturePinchUpdateEvent(float scale,
|
| float anchorX,
|
| @@ -54,7 +54,7 @@ class InputRouterTest : public testing::Test {
|
| void SimulateGestureFlingStartEvent(
|
| float velocityX,
|
| float velocityY,
|
| - WebKit::WebGestureEvent::SourceDevice sourceDevice);
|
| + blink::WebGestureEvent::SourceDevice sourceDevice);
|
| void SimulateTouchEvent(int x, int y);
|
| void SetTouchTimestamp(base::TimeDelta timestamp);
|
|
|
|
|