Refactoring button field and its type

third_party/WebKit/Source/web/tests/VisualViewportTest.cpp

 // 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 "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 1023 matching lines @@
 
     WebMouseEvent mouseDownEvent;
     mouseDownEvent.type = WebInputEvent::MouseDown;
     mouseDownEvent.x = 10;
     mouseDownEvent.y = 10;
     mouseDownEvent.windowX = 10;
     mouseDownEvent.windowY = 10;
     mouseDownEvent.globalX = 110;
     mouseDownEvent.globalY = 210;
     mouseDownEvent.clickCount = 1;
-    mouseDownEvent.button = WebMouseEvent::ButtonRight;
+    mouseDownEvent.button = WebMouseEvent::Button::Right;
 
     // Corresponding release event (Windows shows context menu on release).
     WebMouseEvent mouseUpEvent(mouseDownEvent);
     mouseUpEvent.type = WebInputEvent::MouseUp;
 
     WebFrameClient* oldClient = webViewImpl()->mainFrameImpl()->client();
     MockWebFrameClient mockWebFrameClient;
     EXPECT_CALL(mockWebFrameClient, showContextMenu(ContextMenuAtLocation(mouseDownEvent.x, mouseDownEvent.y)));
 
     // Do a sanity check with no scale applied.
     webViewImpl()->mainFrameImpl()->setClient(&mockWebFrameClient);
     webViewImpl()->handleInputEvent(mouseDownEvent);
     webViewImpl()->handleInputEvent(mouseUpEvent);
 
     Mock::VerifyAndClearExpectations(&mockWebFrameClient);
-    mouseDownEvent.button = WebMouseEvent::ButtonLeft;
+    mouseDownEvent.button = WebMouseEvent::Button::Left;
     webViewImpl()->handleInputEvent(mouseDownEvent);
 
     // Now pinch zoom into the page and move the visual viewport. The context
     // menu should still appear at the location of the event, relative to the
     // WebView.
     VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();
     webViewImpl()->setPageScaleFactor(2);
     visualViewport.setLocation(FloatPoint(60, 80));
     EXPECT_CALL(mockWebFrameClient, showContextMenu(ContextMenuAtLocation(mouseDownEvent.x, mouseDownEvent.y)));
 
-    mouseDownEvent.button = WebMouseEvent::ButtonRight;
+    mouseDownEvent.button = WebMouseEvent::Button::Right;
     webViewImpl()->handleInputEvent(mouseDownEvent);
     webViewImpl()->handleInputEvent(mouseUpEvent);
 
     // Reset the old client so destruction can occur naturally.
     webViewImpl()->mainFrameImpl()->setClient(oldClient);
 }
 
 // Test that the client is notified if page scroll events.
 TEST_P(ParameterizedVisualViewportTest, TestClientNotifiedOfScrollEvents)
 {
@@ skipping 773 matching lines @@
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
     frameView.layoutViewportScrollableArea()->setScrollPosition(DoublePoint(700, 500), ProgrammaticScroll);
 
     webViewImpl()->resize(IntSize(400, 300));
     EXPECT_POINT_EQ(DoublePoint(300, 200), frameView.layoutViewportScrollableArea()->scrollPositionDouble());
 
     RuntimeEnabledFeatures::setScrollAnchoringEnabled(wasScrollAnchoringEnabled);
 }
 
 } // namespace