Refactoring button field and its type (2nd try)

content/browser/renderer_host/input/synthetic_pointer_action_unittest.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 "base/bind.h"
 #include "base/time/time.h"
 #include "content/browser/renderer_host/input/synthetic_gesture.h"
 #include "content/browser/renderer_host/input/synthetic_gesture_target.h"
 #include "content/browser/renderer_host/input/synthetic_pointer_action.h"
 #include "content/browser/renderer_host/input/synthetic_touch_pointer.h"
@@ skipping 368 matching lines @@
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
       static_cast<MockSyntheticPointerMouseActionTarget*>(target_.get());
   EXPECT_EQ(1, num_success_);
   EXPECT_EQ(0, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseMove);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 0);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonNone);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::NoButton);
 
   // Send a mouse down.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_position(gfx::PointF(189, 62));
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::PRESS);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(2, num_success_);
   EXPECT_EQ(0, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseDown);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 1);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonLeft);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
 
   // Send a mouse drag.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_position(gfx::PointF(326, 298));
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::MOVE);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(3, num_success_);
   EXPECT_EQ(0, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseMove);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 1);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonLeft);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
 
   // Send a mouse up.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::RELEASE);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(4, num_success_);
   EXPECT_EQ(0, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseUp);
   EXPECT_EQ(pointer_mouse_target->clickCount(), 1);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonLeft);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
 }
 
 TEST_F(SyntheticPointerActionTest, PointerMouseActionSourceTypeInvalid) {
   CreateSyntheticPointerActionTarget<MockSyntheticPointerMouseActionTarget>();
 
   // Users' gesture source type does not match with the mouse action.
   SyntheticPointerActionParams params = SyntheticPointerActionParams(
       SyntheticPointerActionParams::PointerActionType::PRESS);
   params.gesture_source_type = SyntheticGestureParams::TOUCH_INPUT;
   params.set_index(0);
   params.set_position(gfx::PointF(54, 89));
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(0, num_success_);
   EXPECT_EQ(1, num_failure_);
 
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
       static_cast<MockSyntheticPointerMouseActionTarget*>(target_.get());
   EXPECT_EQ(1, num_success_);
   EXPECT_EQ(1, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseDown);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 1);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonLeft);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
 }
 
 TEST_F(SyntheticPointerActionTest, PointerMouseActionTypeInvalid) {
   CreateSyntheticPointerActionTarget<MockSyntheticPointerMouseActionTarget>();
 
   // Send a mouse move.
   SyntheticPointerActionParams params = SyntheticPointerActionParams(
       SyntheticPointerActionParams::PointerActionType::MOVE);
   params.gesture_source_type = SyntheticGestureParams::MOUSE_INPUT;
   params.set_index(0);
   params.set_position(gfx::PointF(189, 62));
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   MockSyntheticPointerMouseActionTarget* pointer_mouse_target =
       static_cast<MockSyntheticPointerMouseActionTarget*>(target_.get());
   EXPECT_EQ(1, num_success_);
   EXPECT_EQ(0, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseMove);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 0);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonNone);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::NoButton);
 
   // Cannot send a mouse up without sending a mouse down first.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::RELEASE);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(1, num_success_);
   EXPECT_EQ(1, num_failure_);
 
   // Send a mouse down for one finger.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::PRESS);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(2, num_success_);
   EXPECT_EQ(1, num_failure_);
   EXPECT_EQ(pointer_mouse_target->type(), WebInputEvent::MouseDown);
   EXPECT_EQ(pointer_mouse_target->position(), params.position());
   EXPECT_EQ(pointer_mouse_target->clickCount(), 1);
-  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::ButtonLeft);
+  EXPECT_EQ(pointer_mouse_target->button(), WebMouseEvent::Button::Left);
 
   // Cannot send a mouse down again without releasing the mouse button.
   action_param_list_.reset(new std::vector<SyntheticPointerActionParams>());
   params.set_pointer_action_type(
       SyntheticPointerActionParams::PointerActionType::PRESS);
   action_param_list_->push_back(params);
   ForwardSyntheticPointerAction();
 
   EXPECT_EQ(2, num_success_);
   EXPECT_EQ(2, num_failure_);
 }
 
 }  // namespace
 
-}  // namespace content
+}  // namespace content