Refactoring button field and its type

content/browser/renderer_host/web_input_event_aura_unittest.cc

 // Copyright (c) 2012 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/web_input_event_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/macros.h"
@@ skipping 245 matching lines @@
     // Left pressed.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(
         ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321),
         timestamp, ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Left released.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_RELEASED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp, 0,
                               ui::EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Middle pressed.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(
         ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321),
         timestamp, ui::EF_MIDDLE_MOUSE_BUTTON, ui::EF_MIDDLE_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Middle released.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_RELEASED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp, 0,
                               ui::EF_MIDDLE_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Right pressed.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(
         ui::ET_MOUSE_PRESSED, gfx::Point(123, 321), gfx::Point(123, 321),
         timestamp, ui::EF_RIGHT_MOUSE_BUTTON, ui::EF_RIGHT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Right released.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_RELEASED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp, 0,
                               ui::EF_RIGHT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Moved
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_MOVED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp, 0, 0);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Moved with left down
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_MOVED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp,
                               ui::EF_LEFT_MOUSE_BUTTON, 0);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Left with shift pressed.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseEvent aura_event(ui::ET_MOUSE_PRESSED, gfx::Point(123, 321),
                               gfx::Point(123, 321), timestamp,
                               ui::EF_LEFT_MOUSE_BUTTON | ui::EF_SHIFT_DOWN,
                               ui::EF_LEFT_MOUSE_BUTTON);
     blink::WebMouseEvent webkit_event = MakeWebMouseEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Default values for PointerDetails.
     base::TimeTicks timestamp = ui::EventTimeForNow();
@@ skipping 45 matching lines @@
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseWheelEvent aura_event(
         gfx::Vector2d(ui::MouseWheelEvent::kWheelDelta * 2,
                       -ui::MouseWheelEvent::kWheelDelta * 2),
         gfx::Point(123, 321), gfx::Point(123, 321), timestamp, 0, 0);
     blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
     EXPECT_EQ(0, webkit_event.tiltY);
     EXPECT_TRUE(std::isnan(webkit_event.force));
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
   {
     // Mouse wheel with shift and no x offset.
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::MouseWheelEvent aura_event(
         gfx::Vector2d(0, -ui::MouseWheelEvent::kWheelDelta * 2),
         gfx::Point(123, 321), gfx::Point(123, 321), timestamp,
         ui::EF_SHIFT_DOWN, 0);
     blink::WebMouseWheelEvent webkit_event = MakeWebMouseWheelEvent(aura_event);
     EXPECT_EQ(ui::EventFlagsToWebEventModifiers(aura_event.flags()),
               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);
     EXPECT_EQ(blink::WebPointerProperties::PointerType::Mouse,
               webkit_event.pointerType);
     EXPECT_EQ(0, webkit_event.tiltX);
     EXPECT_EQ(0, webkit_event.tiltY);
     EXPECT_TRUE(std::isnan(webkit_event.force));
     EXPECT_EQ(123, webkit_event.x);
     EXPECT_EQ(123, webkit_event.windowX);
     EXPECT_EQ(321, webkit_event.y);
     EXPECT_EQ(321, webkit_event.windowY);
   }
 }
 
 }  // namespace content