Refactoring button field and its type (2nd try)

content/browser/renderer_host/input/main_thread_event_queue_browsertest.cc

 // Copyright 2016 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 <utility>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 93 matching lines @@
     int value = 0;
     EXPECT_TRUE(content::ExecuteScriptAndExtractInt(
         shell(), "domAutomationController.send(" + script + ")", &value));
     return value;
   }
 
   void DoMouseMove() {
     // Send a click event to cause some jankiness. This is done via a click
     // event as ExecuteScript is synchronous.
     SimulateMouseClick(shell()->web_contents(), 0,
-                       blink::WebPointerProperties::ButtonLeft);
+                       blink::WebPointerProperties::Button::Left);
     scoped_refptr<InputMsgWatcher> input_msg_watcher(
         new InputMsgWatcher(GetWidgetHost(), blink::WebInputEvent::MouseMove));
     GetWidgetHost()->ForwardMouseEvent(SyntheticWebMouseEventBuilder::Build(
         blink::WebInputEvent::MouseMove, 10, 10, 0));
     GetWidgetHost()->ForwardMouseEvent(SyntheticWebMouseEventBuilder::Build(
         blink::WebInputEvent::MouseMove, 15, 15, 0));
     GetWidgetHost()->ForwardMouseEvent(SyntheticWebMouseEventBuilder::Build(
         blink::WebInputEvent::MouseMove, 20, 25, 0));
 
     // Runs until we get the InputMsgAck callback.
@@ skipping 18 matching lines @@
     kEvents[1].PressPoint(10, 10);
     kEvents[1].MovePoint(0, 20, 20);
     kEvents[2].PressPoint(10, 10);
     kEvents[2].MovePoint(0, 30, 30);
     kEvents[3].PressPoint(10, 10);
     kEvents[3].MovePoint(0, 35, 40);
 
     // Send a click event to cause some jankiness. This is done via a click
     // event as ExecuteScript is synchronous.
     SimulateMouseClick(shell()->web_contents(), 0,
-                       blink::WebPointerProperties::ButtonLeft);
+                       blink::WebPointerProperties::Button::Left);
     scoped_refptr<InputMsgWatcher> input_msg_watcher(
         new InputMsgWatcher(GetWidgetHost(), blink::WebInputEvent::TouchMove));
 
     for (const auto& event : kEvents)
       GetWidgetHost()->ForwardEmulatedTouchEvent(event);
 
     // Runs until we get the InputMsgAck callback.
     EXPECT_EQ(INPUT_EVENT_ACK_STATE_SET_NON_BLOCKING,
               input_msg_watcher->WaitForAck());
 
@@ skipping 24 matching lines @@
 #define MAYBE_TouchMove DISABLED_TouchMove
 #else
 #define MAYBE_TouchMove TouchMove
 #endif
 IN_PROC_BROWSER_TEST_F(MainThreadEventQueueBrowserTest, MAYBE_TouchMove) {
   LoadURL(kJankyPageURL);
   DoTouchMove();
 }
 
 }  // namespace content