Index: content/browser/renderer_host/web_input_event_aura_unittest.cc |
diff --git a/content/browser/renderer_host/web_input_event_aura_unittest.cc b/content/browser/renderer_host/web_input_event_aura_unittest.cc |
index 63143f6767cade0630d66efc7607c182ee5a670a..663a03174ee66fd2d3ebf38a2c398fb55aba7c3e 100644 |
--- a/content/browser/renderer_host/web_input_event_aura_unittest.cc |
+++ b/content/browser/renderer_host/web_input_event_aura_unittest.cc |
@@ -263,7 +263,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -282,7 +282,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -301,7 +301,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonMiddle, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -320,7 +320,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonMiddle, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Middle, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -339,7 +339,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonRight, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -358,7 +358,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonRight, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Right, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseUp, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -376,7 +376,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -395,7 +395,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseMove, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -415,7 +415,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonLeft, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::Left, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseDown, webkit_event.type); |
EXPECT_EQ(aura_event.GetClickCount(), webkit_event.clickCount); |
EXPECT_EQ(123, webkit_event.x); |
@@ -481,7 +481,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseWheelEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); |
EXPECT_FLOAT_EQ(aura_event.x_offset() / 53.0f, webkit_event.wheelTicksX); |
EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksY); |
@@ -507,7 +507,7 @@ TEST(WebInputEventAuraTest, TestMakeWebMouseWheelEvent) { |
webkit_event.modifiers); |
EXPECT_FLOAT_EQ(ui::EventTimeStampToSeconds(timestamp), |
webkit_event.timeStampSeconds); |
- EXPECT_EQ(blink::WebMouseEvent::ButtonNone, webkit_event.button); |
+ EXPECT_EQ(blink::WebMouseEvent::Button::NoButton, webkit_event.button); |
EXPECT_EQ(blink::WebInputEvent::MouseWheel, webkit_event.type); |
EXPECT_FLOAT_EQ(aura_event.y_offset() / 53.0f, webkit_event.wheelTicksX); |
EXPECT_FLOAT_EQ(0, webkit_event.wheelTicksY); |