[VK] Follow up on VK behaviour on shelf.

Somehow didn't upload newest changes to the submitted CL, so this is
just following up.

https://chromium-review.googlesource.com/c/chromium/src/+/1282514

TBR=jamescook@chromium.org

Bug: 893859
Change-Id: I970b36469320705fc80f9e171957c53bce08d187
Reviewed-on: https://chromium-review.googlesource.com/c/1290590Reviewed-by: Darren Shen <shend@chromium.org>
Commit-Queue: Darren Shen <shend@chromium.org>
Cr-Commit-Position: refs/heads/master@{#601057}

ash/shelf/shelf_widget_unittest.cc

@@ -561,11 +561,10 @@ TEST_F(ShelfWidgetVirtualKeyboardTest, ClickingHidesVirtualKeyboard) {
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  ShelfWidget* shelf_widget = GetShelfWidget();
-  ui::test::EventGenerator generator(
-      shelf_widget->GetNativeWindow()->GetRootWindow(),
-      shelf_widget->GetWindowBoundsInScreen().CenterPoint());
-  generator.ClickLeftButton();
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint());
+  generator->ClickLeftButton();
 
   // Times out if test fails.
   ASSERT_TRUE(keyboard::WaitUntilHidden());
@@ -576,11 +575,10 @@ TEST_F(ShelfWidgetVirtualKeyboardTest, TappingHidesVirtualKeyboard) {
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  ShelfWidget* shelf_widget = GetShelfWidget();
-  ui::test::EventGenerator generator(
-      shelf_widget->GetNativeWindow()->GetRootWindow(),
-      shelf_widget->GetWindowBoundsInScreen().CenterPoint());
-  generator.PressTouch();
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint());
+  generator->PressTouch();
 
   // Times out if test fails.
   ASSERT_TRUE(keyboard::WaitUntilHidden());
@@ -591,15 +589,14 @@ TEST_F(ShelfWidgetVirtualKeyboardTest, DoesNotHideLockedVirtualKeyboard) {
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  ShelfWidget* shelf_widget = GetShelfWidget();
-  ui::test::EventGenerator generator(
-      shelf_widget->GetNativeWindow()->GetRootWindow(),
-      shelf_widget->GetWindowBoundsInScreen().CenterPoint());
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      GetShelfWidget()->GetWindowBoundsInScreen().CenterPoint());
 
-  generator.ClickLeftButton();
+  generator->ClickLeftButton();
   EXPECT_FALSE(keyboard::IsKeyboardHiding());
 
-  generator.PressTouch();
+  generator->PressTouch();
   EXPECT_FALSE(keyboard::IsKeyboardHiding());
 }
 

ash/system/status_area_widget_unittest.cc

@@ -333,7 +333,7 @@ TEST_F(UnifiedStatusAreaWidgetTest, Basics) {
   EXPECT_TRUE(status->unified_system_tray());
 }
 
-class StatusAreaVirtualKeyboardTest : public AshTestBase {
+class StatusAreaWidgetVirtualKeyboardTest : public AshTestBase {
  protected:
   void SetUp() override {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -352,50 +352,53 @@ class StatusAreaVirtualKeyboardTest : public AshTestBase {
   }
 };
 
-TEST_F(StatusAreaVirtualKeyboardTest, ClickingHidesVirtualKeyboard) {
+TEST_F(StatusAreaWidgetVirtualKeyboardTest, ClickingHidesVirtualKeyboard) {
   keyboard_controller()->ShowKeyboard(false /* locked */);
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  StatusAreaWidget* status = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
-  ui::test::EventGenerator generator(
-      status->GetNativeWindow()->GetRootWindow(),
-      status->GetWindowBoundsInScreen().CenterPoint());
-  generator.ClickLeftButton();
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+          ->GetWindowBoundsInScreen()
+          .CenterPoint());
+  generator->ClickLeftButton();
 
   // Times out if test fails.
   ASSERT_TRUE(keyboard::WaitUntilHidden());
 }
 
-TEST_F(StatusAreaVirtualKeyboardTest, TappingHidesVirtualKeyboard) {
+TEST_F(StatusAreaWidgetVirtualKeyboardTest, TappingHidesVirtualKeyboard) {
   keyboard_controller()->ShowKeyboard(false /* locked */);
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  StatusAreaWidget* status = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
-  ui::test::EventGenerator generator(
-      status->GetNativeWindow()->GetRootWindow(),
-      status->GetWindowBoundsInScreen().CenterPoint());
-  generator.PressTouch();
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+          ->GetWindowBoundsInScreen()
+          .CenterPoint());
+  generator->PressTouch();
 
   // Times out if test fails.
   ASSERT_TRUE(keyboard::WaitUntilHidden());
 }
 
-TEST_F(StatusAreaVirtualKeyboardTest, DoesNotHideLockedVirtualKeyboard) {
+TEST_F(StatusAreaWidgetVirtualKeyboardTest, DoesNotHideLockedVirtualKeyboard) {
   keyboard_controller()->ShowKeyboard(true /* locked */);
   keyboard_controller()->NotifyKeyboardWindowLoaded();
   ASSERT_TRUE(keyboard_controller()->IsKeyboardVisible());
 
-  StatusAreaWidget* status = StatusAreaWidgetTestHelper::GetStatusAreaWidget();
-  ui::test::EventGenerator generator(
-      status->GetNativeWindow()->GetRootWindow(),
-      status->GetWindowBoundsInScreen().CenterPoint());
+  ui::test::EventGenerator* generator = GetEventGenerator();
+  generator->set_current_location(
+      StatusAreaWidgetTestHelper::GetStatusAreaWidget()
+          ->GetWindowBoundsInScreen()
+          .CenterPoint());
 
-  generator.ClickLeftButton();
+  generator->ClickLeftButton();
   EXPECT_FALSE(keyboard::IsKeyboardHiding());
 
-  generator.PressTouch();
+  generator->PressTouch();
   EXPECT_FALSE(keyboard::IsKeyboardHiding());
 }
 

testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter

@@ -28,9 +28,9 @@
 -ShelfWidgetVirtualKeyboardTest.ClickingHidesVirtualKeyboard
 -ShelfWidgetVirtualKeyboardTest.TappingHidesVirtualKeyboard
 -ShelfWidgetVirtualKeyboardTest.DoesNotHideLockedVirtualKeyboard
--StatusAreaVirtualKeyboardTest.ClickingHidesVirtualKeyboard
--StatusAreaVirtualKeyboardTest.TappingHidesVirtualKeyboard
--StatusAreaVirtualKeyboardTest.DoesNotHideLockedVirtualKeyboard
+-StatusAreaWidgetVirtualKeyboardTest.ClickingHidesVirtualKeyboard
+-StatusAreaWidgetVirtualKeyboardTest.TappingHidesVirtualKeyboard
+-StatusAreaWidgetVirtualKeyboardTest.DoesNotHideLockedVirtualKeyboard
 -VirtualKeyboardAlwaysOnTopControllerTest.NotifyKeyboardBoundsChanging
 -VirtualKeyboardControllerAlwaysEnabledTest.MovesKeyboardToFirstTouchableDisplay
 -VirtualKeyboardControllerAlwaysEnabledTest.MovesKeyboardToFirstTouchableDisplayIfFocusedDisplayIsNotTouchable