ui/aura/gestures/gesture_recognizer_unittest.cc - Issue 76583003: Rename RootWindowHost* to WindowTreeHost*

Unified Diff: ui/aura/gestures/gesture_recognizer_unittest.cc

Issue 76583003: Rename RootWindowHost* to WindowTreeHost* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ui/aura/gestures/gesture_recognizer_unittest.cc

diff --git a/ui/aura/gestures/gesture_recognizer_unittest.cc b/ui/aura/gestures/gesture_recognizer_unittest.cc

index d6f28bb6fa2790f3e5ef67aa013b88423a68e4d9..1ed8b30927ef23bd576c8f011d04a4cf87295b2d 100644

--- a/ui/aura/gestures/gesture_recognizer_unittest.cc

+++ b/ui/aura/gestures/gesture_recognizer_unittest.cc

@@ -589,7 +589,7 @@ class TimedEvents {

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(x, y),

touch_id,

base::TimeDelta::FromMilliseconds(simulated_now_));

- root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ root_window->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

simulated_now_ += time_step;

}

@@ -603,7 +603,7 @@ class TimedEvents {

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(x, y),

touch_id,

base::TimeDelta::FromMilliseconds(simulated_now_));

- root_window->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ root_window->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

simulated_now_++;

}

};

@@ -717,7 +717,7 @@ TEST_F(GestureRecognizerTest, GestureEventTap) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->show_press());

EXPECT_TRUE(delegate->tap_down());

@@ -739,7 +739,7 @@ TEST_F(GestureRecognizerTest, GestureEventTap) {

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -772,7 +772,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.Now());

press.set_radius_x(5);

press.set_radius_y(12);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -790,7 +790,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

release.set_radius_x(5);

release.set_radius_y(12);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -815,7 +815,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.Now());

press.set_radius_x(8);

press.set_radius_y(14);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -831,7 +831,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

release.set_radius_x(20);

release.set_radius_y(13);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -856,7 +856,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.Now());

press.set_radius_x(6);

press.set_radius_y(10);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -872,7 +872,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.LeapForward(50));

move.set_radius_x(8);

move.set_radius_y(12);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -888,7 +888,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

release.set_radius_x(4);

release.set_radius_y(8);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -913,7 +913,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.Now());

press.set_radius_x(7);

press.set_radius_y(10);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -928,7 +928,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.LeapForward(50));

move.set_radius_x(13);

move.set_radius_y(12);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -943,7 +943,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.LeapForward(50));

move1.set_radius_x(16);

move1.set_radius_y(16);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move1);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -958,7 +958,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

kTouchId, tes.LeapForward(50));

move2.set_radius_x(14);

move2.set_radius_y(10);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move2);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -974,7 +974,7 @@ TEST_F(GestureRecognizerTest, GestureEventTapRegion) {

release.set_radius_x(8);

release.set_radius_y(9);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1008,7 +1008,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_BEGIN,

ui::ET_GESTURE_TAP_DOWN);

@@ -1049,7 +1049,7 @@ TEST_F(GestureRecognizerTest, GestureEventScroll) {

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId,

tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_SCROLL_FLING_START,

ui::ET_GESTURE_END);

@@ -1076,7 +1076,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollPrediction) {

gfx::Vector2dF total_scroll;

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_BEGIN,

ui::ET_GESTURE_TAP_DOWN);

@@ -1126,7 +1126,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollPrediction) {

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId,

tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

}

// Check that the bounding box during a scroll event is correct.

@@ -1150,7 +1150,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollBoundingBox) {

gfx::Point(kPositionX, kPositionY),

kTouchId,

tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_EQ(gfx::Rect(kPositionX - radius,

kPositionY - radius,

radius * 2,

@@ -1175,7 +1175,7 @@ TEST_F(GestureRecognizerTest, GestureEventScrollBoundingBox) {

kPositionY + kScrollAmount),

kTouchId, press.time_stamp() +

base::TimeDelta::FromMilliseconds(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_EQ(gfx::Rect(kPositionX + kScrollAmount - radius,

kPositionY + kScrollAmount - radius,

radius * 2,

@@ -1198,7 +1198,7 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailFling) {

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

// Move the touch-point horizontally enough that it is considered a

// horizontal scroll.

@@ -1221,7 +1221,7 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailFling) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->fling());

EXPECT_FALSE(delegate->scroll_end());

@@ -1242,7 +1242,7 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailFling) {

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

// Move the touch-point vertically enough that it is considered a

// vertical scroll.

@@ -1265,7 +1265,7 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailFling) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->fling());

EXPECT_FALSE(delegate->scroll_end());

@@ -1286,7 +1286,7 @@ TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

// Move the touch-point such that a non-rail scroll begins

tes.SendScrollEvent(dispatcher(), 20, 20, kTouchId, delegate.get());

@@ -1301,7 +1301,7 @@ TEST_F(GestureRecognizerTest, GestureEventNonRailFling) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->fling());

EXPECT_FALSE(delegate->scroll_end());

@@ -1330,7 +1330,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPress) {

ui::TouchEvent press1(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1);

EXPECT_TRUE(delegate->tap_down());

EXPECT_TRUE(delegate->begin());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1347,7 +1347,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPress) {

delegate->Reset();

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->long_press());

// Note the tap down isn't cancelled until the release

@@ -1379,7 +1379,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledByScroll) {

ui::TouchEvent press1(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1);

EXPECT_TRUE(delegate->tap_down());

// We haven't pressed long enough for a long press to occur

@@ -1396,7 +1396,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledByScroll) {

delegate->Reset();

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.LeapForward(10));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->long_press());

EXPECT_FALSE(delegate->tap_cancel());

}

@@ -1422,7 +1422,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongTap) {

ui::TouchEvent press1(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1);

EXPECT_TRUE(delegate->tap_down());

EXPECT_TRUE(delegate->begin());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1439,7 +1439,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongTap) {

delegate->Reset();

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->long_press());

EXPECT_TRUE(delegate->long_tap());

@@ -1472,7 +1472,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_TRUE(delegate->tap_down());

EXPECT_TRUE(delegate->begin());

@@ -1483,7 +1483,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {

delegate->Reset();

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),

kTouchId2, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

EXPECT_FALSE(delegate->tap_down()); // no touch down for second tap.

EXPECT_TRUE(delegate->tap_cancel());

EXPECT_TRUE(delegate->begin());

@@ -1497,7 +1497,7 @@ TEST_F(GestureRecognizerTest, GestureEventLongPressCancelledBySecondTap) {

delegate->Reset();

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->long_press());

EXPECT_TRUE(delegate->two_finger_tap());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1516,7 +1516,7 @@ TEST_F(GestureRecognizerTest, GestureEventHorizontalRailScroll) {

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

// Move the touch-point horizontally enough that it is considered a

// horizontal scroll.

@@ -1563,7 +1563,7 @@ TEST_F(GestureRecognizerTest, GestureEventVerticalRailScroll) {

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 0),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

// Move the touch-point vertically enough that it is considered a

// vertical scroll.

@@ -1611,7 +1611,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1624,7 +1624,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1637,7 +1637,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent press1(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.LeapForward(1000));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1652,7 +1652,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(130, 230),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_TRUE(delegate->tap_cancel());

@@ -1668,7 +1668,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent move1(ui::ET_TOUCH_MOVED, gfx::Point(110, 211),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move1);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1683,7 +1683,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent move2(ui::ET_TOUCH_MOVED, gfx::Point(140, 215),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move2);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1697,7 +1697,7 @@ TEST_F(GestureRecognizerTest, GestureTapFollowedByScroll) {

delegate->Reset();

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1724,7 +1724,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

queued_delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId1, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_FALSE(queued_delegate->tap());

EXPECT_FALSE(queued_delegate->tap_down());

EXPECT_FALSE(queued_delegate->tap_cancel());

@@ -1739,7 +1739,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId1, press.time_stamp() +

base::TimeDelta::FromMilliseconds(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_FALSE(queued_delegate->tap());

EXPECT_FALSE(queued_delegate->tap_down());

EXPECT_FALSE(queued_delegate->tap_cancel());

@@ -1758,7 +1758,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

delegate->Reset();

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 20),

kTouchId2, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

EXPECT_FALSE(delegate->tap());

EXPECT_TRUE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1770,7 +1770,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

ui::TouchEvent release2(ui::ET_TOUCH_RELEASED, gfx::Point(10, 20),

kTouchId2, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release2);

// Process the first queued event.

queued_delegate->Reset();

@@ -1801,7 +1801,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

queued_delegate->Reset();

ui::TouchEvent press3(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId1, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press3);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press3);

EXPECT_FALSE(queued_delegate->tap());

EXPECT_FALSE(queued_delegate->tap_down());

EXPECT_FALSE(queued_delegate->tap_cancel());

@@ -1817,7 +1817,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

delegate->Reset();

ui::TouchEvent press4(ui::ET_TOUCH_PRESSED, gfx::Point(103, 203),

kTouchId2, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press4);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press4);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1842,7 +1842,7 @@ TEST_F(GestureRecognizerTest, AsynchronousGestureRecognition) {

int x_move = ui::GestureConfiguration::max_touch_move_in_pixels_for_click();

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(103 + x_move, 203),

kTouchId2, GetTime());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

EXPECT_FALSE(delegate->tap_cancel());

@@ -1916,7 +1916,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_BEGIN,

ui::ET_GESTURE_TAP_DOWN);

@@ -1926,7 +1926,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(130, 301),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

EXPECT_3_EVENTS(delegate->events(),

ui::ET_GESTURE_TAP_CANCEL,

ui::ET_GESTURE_SCROLL_BEGIN,

@@ -1937,7 +1937,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_BEGIN,

ui::ET_GESTURE_PINCH_BEGIN);

@@ -1948,7 +1948,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent move3(ui::ET_TOUCH_MOVED, gfx::Point(95, 201),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move3);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move3);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_UPDATE,

ui::ET_GESTURE_SCROLL_UPDATE);

@@ -1959,7 +1959,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent move4(ui::ET_TOUCH_MOVED, gfx::Point(55, 15),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move4);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move4);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_UPDATE,

ui::ET_GESTURE_SCROLL_UPDATE);

@@ -1970,7 +1970,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_END,

ui::ET_GESTURE_END);

@@ -1981,7 +1981,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromScroll) {

delegate->Reset();

ui::TouchEvent move5(ui::ET_TOUCH_MOVED, gfx::Point(25, 10),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move5);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move5);

EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);

EXPECT_TRUE(delegate->bounding_box().IsEmpty());

}

@@ -2000,11 +2000,11 @@ scoped_ptr<GestureEventConsumeDelegate> delegate(

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 301),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

delegate->Reset();

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),

kTouchId2, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

EXPECT_FALSE(delegate->pinch_begin());

// Touch move triggers pinch begin.

@@ -2021,7 +2021,7 @@ scoped_ptr<GestureEventConsumeDelegate> delegate(

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_TRUE(delegate->pinch_end());

tes.SendScrollEvent(dispatcher(), 130, 230, kTouchId2, delegate.get());

@@ -2031,12 +2031,12 @@ scoped_ptr<GestureEventConsumeDelegate> delegate(

delegate->Reset();

ui::TouchEvent press3(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press3);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press3);

// Now the touch points are close. So we will go into two finger tap.

// Move the touch-point enough to break two-finger-tap and enter pinch.

ui::TouchEvent move2(ui::ET_TOUCH_MOVED, gfx::Point(101, 202),

kTouchId1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move2);

EXPECT_TRUE(delegate->pinch_begin());

tes.SendScrollEvent(dispatcher(), 130, 230, kTouchId1, delegate.get());

@@ -2060,7 +2060,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 301),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_BEGIN,

ui::ET_GESTURE_TAP_DOWN);

@@ -2070,7 +2070,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, gfx::Point(10, 10),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_TAP_CANCEL,

ui::ET_GESTURE_BEGIN);

@@ -2081,7 +2081,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent move3(ui::ET_TOUCH_MOVED, gfx::Point(65, 201),

kTouchId1, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move3);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move3);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_BEGIN,

ui::ET_GESTURE_SCROLL_BEGIN);

@@ -2092,7 +2092,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent move4(ui::ET_TOUCH_MOVED, gfx::Point(55, 15),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move4);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move4);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_UPDATE,

ui::ET_GESTURE_SCROLL_UPDATE);

@@ -2103,7 +2103,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId1, tes.LeapForward(10));

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

EXPECT_2_EVENTS(delegate->events(),

ui::ET_GESTURE_PINCH_END,

ui::ET_GESTURE_END);

@@ -2114,7 +2114,7 @@ TEST_F(GestureRecognizerTest, GestureEventPinchFromTap) {

delegate->Reset();

ui::TouchEvent move5(ui::ET_TOUCH_MOVED, gfx::Point(25, 10),

kTouchId2, tes.Now());

- root->AsRootWindowHostDelegate()->OnHostTouchEvent(&move5);

+ root->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move5);

EXPECT_1_EVENT(delegate->events(), ui::ET_GESTURE_SCROLL_UPDATE);

EXPECT_TRUE(delegate->bounding_box().IsEmpty());

}

@@ -2126,7 +2126,7 @@ TEST_F(GestureRecognizerTest, GestureEventIgnoresDisconnectedEvents) {

ui::TouchEvent release1(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

6, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release1);

EXPECT_FALSE(delegate->tap());

EXPECT_FALSE(delegate->tap_down());

}

@@ -2164,7 +2164,7 @@ TEST_F(GestureRecognizerTest, GestureEventTouchLockSelectsCorrectWindow) {

windows[i]->set_id(i);

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, window_bounds[i].origin(),

i, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

}

// Touches should now be associated with the closest touch within

@@ -2181,10 +2181,10 @@ TEST_F(GestureRecognizerTest, GestureEventTouchLockSelectsCorrectWindow) {

// Add a touch in the middle associated with windows[2]

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(0, 500),

kNumWindows, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

ui::TouchEvent move(ui::ET_TOUCH_MOVED, gfx::Point(250, 250),

kNumWindows, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

target = gesture_recognizer->GetTargetForLocation(gfx::Point(250, 250));

EXPECT_EQ("2", WindowIDAsString(target));

@@ -2205,7 +2205,7 @@ TEST_F(GestureRecognizerTest, GestureEventTouchLockSelectsCorrectWindow) {

// Move a touch associated with windows[2] to 1000, 1000

ui::TouchEvent move2(ui::ET_TOUCH_MOVED, gfx::Point(1000, 1000),

kNumWindows, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move2);

target = gesture_recognizer->GetTargetForLocation(gfx::Point(1000, 1000));

EXPECT_EQ("2", WindowIDAsString(target));

@@ -2236,11 +2236,11 @@ TEST_F(GestureRecognizerTest, GestureEventOutsideRootWindowTap) {

gfx::Point pos1(-10, -10);

ui::TouchEvent press1(ui::ET_TOUCH_PRESSED, pos1, 0, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press1);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press1);

gfx::Point pos2(1000, 1000);

ui::TouchEvent press2(ui::ET_TOUCH_PRESSED, pos2, 1, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press2);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press2);

// As these presses were outside the root window, they should be

// associated with the root window.

@@ -2261,10 +2261,10 @@ TEST_F(GestureRecognizerTest, NoTapWithPreventDefaultedRelease) {

delegate->Reset();

ui::TouchEvent press(ui::ET_TOUCH_PRESSED, gfx::Point(101, 201),

kTouchId, tes.Now());

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(101, 201),

kTouchId, tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

delegate->Reset();

delegate->ReceivedAck();

@@ -2294,9 +2294,9 @@ TEST_F(GestureRecognizerTest, PinchScrollWithPreventDefaultedRelease) {

tes.LeapForward(200));

ui::TouchEvent release(ui::ET_TOUCH_RELEASED, gfx::Point(15, 25), kTouchId1,

tes.LeapForward(50));

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move);

- dispatcher()->AsRootWindowHostDelegate()->OnHostTouchEvent(&release);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&press);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&move);

+ dispatcher()->AsWindowTreeHostDelegate()->OnHostTouchEvent(&release);

delegate->Reset();

// Ack the press event.

@@ -2330,12 +2330,12 @@ TEST_F(GestureRecognizerTest, PinchScrollWithPreventDefaultedRelease) {

tes.LeapForward(14));

// Do a pinch.