| Index: content/browser/renderer_host/input/gesture_text_selector_unittest.cc
|
| diff --git a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
|
| index 1fe3828dc3cecea62e2a3cb637e7138573454daa..53dca20f57e88cf1d049e28ff02e7adf8f928882 100644
|
| --- a/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
|
| +++ b/content/browser/renderer_host/input/gesture_text_selector_unittest.cc
|
| @@ -66,28 +66,28 @@ TEST_F(GestureTextSelectorTest, ShouldStartTextSelection) {
|
| { // Touched with a finger.
|
| MockMotionEvent e(MotionEvent::ACTION_DOWN, event_time, 50.0f, 50.0f);
|
| e.SetToolType(0, MotionEvent::TOOL_TYPE_FINGER);
|
| - e.SetButtonState(0);
|
| + e.set_button_state(0);
|
| EXPECT_FALSE(selector_->ShouldStartTextSelection(e));
|
| }
|
|
|
| { // Touched with a stylus, but no button pressed.
|
| MockMotionEvent e(MotionEvent::ACTION_DOWN, event_time, 50.0f, 50.0f);
|
| e.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - e.SetButtonState(0);
|
| + e.set_button_state(0);
|
| EXPECT_FALSE(selector_->ShouldStartTextSelection(e));
|
| }
|
|
|
| { // Touched with a stylus, with first button (BUTTON_SECONDARY) pressed.
|
| MockMotionEvent e(MotionEvent::ACTION_DOWN, event_time, 50.0f, 50.0f);
|
| e.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - e.SetButtonState(MotionEvent::BUTTON_SECONDARY);
|
| + e.set_button_state(MotionEvent::BUTTON_SECONDARY);
|
| EXPECT_TRUE(selector_->ShouldStartTextSelection(e));
|
| }
|
|
|
| { // Touched with a stylus, with two buttons pressed.
|
| MockMotionEvent e(MotionEvent::ACTION_DOWN, event_time, 50.0f, 50.0f);
|
| e.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - e.SetButtonState(
|
| + e.set_button_state(
|
| MotionEvent::BUTTON_SECONDARY | MotionEvent::BUTTON_TERTIARY);
|
| EXPECT_FALSE(selector_->ShouldStartTextSelection(e));
|
| }
|
| @@ -115,7 +115,7 @@ TEST_F(GestureTextSelectorTest, PenDragging) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_down(MotionEvent::ACTION_DOWN, event_time, x1, y1);
|
| action_down.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_down.SetButtonState(MotionEvent::BUTTON_SECONDARY);
|
| + action_down.set_button_state(MotionEvent::BUTTON_SECONDARY);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_down));
|
| EXPECT_TRUE(event_log_.empty());
|
|
|
| @@ -123,7 +123,7 @@ TEST_F(GestureTextSelectorTest, PenDragging) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_move(MotionEvent::ACTION_MOVE, event_time, x2, y2);
|
| action_move.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_move.SetButtonState(MotionEvent::BUTTON_SECONDARY);
|
| + action_move.set_button_state(MotionEvent::BUTTON_SECONDARY);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_move));
|
| EXPECT_TRUE(event_log_.empty());
|
|
|
| @@ -158,7 +158,7 @@ TEST_F(GestureTextSelectorTest, PenDragging) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_up(MotionEvent::ACTION_UP, event_time, x2, y2);
|
| action_up.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_up.SetButtonState(0);
|
| + action_up.set_button_state(0);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_up));
|
| EXPECT_EQ(3u, event_log_.size()); // NO CHANGE
|
|
|
| @@ -181,7 +181,7 @@ TEST_F(GestureTextSelectorTest, TapToSelectWord) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_down(MotionEvent::ACTION_DOWN, event_time, x1, y1);
|
| action_down.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_down.SetButtonState(MotionEvent::BUTTON_SECONDARY);
|
| + action_down.set_button_state(MotionEvent::BUTTON_SECONDARY);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_down));
|
| EXPECT_TRUE(event_log_.empty());
|
|
|
| @@ -197,7 +197,7 @@ TEST_F(GestureTextSelectorTest, TapToSelectWord) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_move(MotionEvent::ACTION_MOVE, event_time, x2, y2);
|
| action_move.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_move.SetButtonState(MotionEvent::BUTTON_SECONDARY);
|
| + action_move.set_button_state(MotionEvent::BUTTON_SECONDARY);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_move));
|
| EXPECT_TRUE(event_log_.empty());
|
|
|
| @@ -205,7 +205,7 @@ TEST_F(GestureTextSelectorTest, TapToSelectWord) {
|
| event_time += base::TimeDelta::FromMilliseconds(10);
|
| MockMotionEvent action_up(MotionEvent::ACTION_UP, event_time, x2, y2);
|
| action_up.SetToolType(0, MotionEvent::TOOL_TYPE_STYLUS);
|
| - action_up.SetButtonState(0);
|
| + action_up.set_button_state(0);
|
| EXPECT_TRUE(selector_->OnTouchEvent(action_up));
|
| EXPECT_TRUE(event_log_.empty());
|
|
|
|
|