| Index: ash/system/tray/tray_details_view_unittest.cc
|
| diff --git a/ash/system/tray/tray_details_view_unittest.cc b/ash/system/tray/tray_details_view_unittest.cc
|
| index 5c7f99adf7ba962a245b2bccbfec5ef298fc1c2e..0d83ae153a2c8fe489a0b430278353cc3c9b1fee 100644
|
| --- a/ash/system/tray/tray_details_view_unittest.cc
|
| +++ b/ash/system/tray/tray_details_view_unittest.cc
|
| @@ -201,11 +201,9 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedback) {
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| generator.set_current_location(view->GetBoundsInScreen().CenterPoint());
|
| generator.PressTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_TRUE(view->hover());
|
|
|
| generator.ReleaseTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(view->hover());
|
| }
|
|
|
| @@ -218,17 +216,14 @@ TEST_F(TrayDetailsViewTest, HoverHighlightViewTouchFeedbackCancellation) {
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| generator.set_current_location(view_bounds.CenterPoint());
|
| generator.PressTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_TRUE(view->hover());
|
|
|
| gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
|
| generator.MoveTouch(move_point);
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(view->hover());
|
|
|
| generator.set_current_location(move_point);
|
| generator.ReleaseTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(view->hover());
|
| }
|
|
|
| @@ -240,11 +235,9 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedback) {
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| generator.set_current_location(button->GetBoundsInScreen().CenterPoint());
|
| generator.PressTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_TRUE(button->background());
|
|
|
| generator.ReleaseTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(button->background());
|
| }
|
|
|
| @@ -258,17 +251,14 @@ TEST_F(TrayDetailsViewTest, TrayPopupHeaderButtonTouchFeedbackCancellation) {
|
| ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
|
| generator.set_current_location(view_bounds.CenterPoint());
|
| generator.PressTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_TRUE(button->background());
|
|
|
| gfx::Point move_point(view_bounds.x(), view_bounds.CenterPoint().y());
|
| generator.MoveTouch(move_point);
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(button->background());
|
|
|
| generator.set_current_location(move_point);
|
| generator.ReleaseTouch();
|
| - RunAllPendingInMessageLoop();
|
| EXPECT_FALSE(button->background());
|
| }
|
|
|
|
|