Use the configured screen position client by default for Aura in tests.

This will allow enabling a previously disabled test for Windows.

Bug: none
Change-Id: I58a0a62db1228e303de71519914a6b744711ce97
Reviewed-on: https://chromium-review.googlesource.com/c/1338945
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611281}

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

@@ -635,8 +635,7 @@ IN_PROC_BROWSER_TEST_P(ImmersiveModeBrowserViewTest,
   ui::test::EventGenerator event_generator(window->GetRootWindow());
   gfx::Size button_size =
       ash::GetAshLayoutSize(ash::AshLayoutSize::kBrowserCaptionMaximized);
-  gfx::Point point_in_restore_button(
-      window->GetBoundsInRootWindow().top_right());
+  gfx::Point point_in_restore_button(window->GetBoundsInScreen().top_right());
   point_in_restore_button.Offset(-2 * button_size.width(),
                                  button_size.height() / 2);
 

chrome/browser/ui/window_sizer/window_sizer_ash_uitest.cc

@@ -28,14 +28,13 @@
 
 namespace {
 
-// Get the bounds of the browser shortcut item in the root window space.
-gfx::Rect GetChromeIconBoundsForRootWindow(aura::Window* root) {
+// Get the bounds of the browser shortcut item in screen space.
+gfx::Rect GetChromeIconBoundsInScreen(aura::Window* root) {
   ash::ShelfView* shelf_view =
       ash::Shelf::ForWindow(root)->GetShelfViewForTesting();
   const views::ViewModel* view_model = shelf_view->view_model_for_test();
   EXPECT_EQ(3, view_model->view_size());
   gfx::Rect bounds = view_model->view_at(2)->GetBoundsInScreen();
-  wm::ConvertRectFromScreen(root, &bounds);
   return bounds;
 }
 
@@ -45,13 +44,13 @@ void EnsureShelfInitialization() {
   ash::ShelfView* shelf_view =
       ash::Shelf::ForWindow(root)->GetShelfViewForTesting();
   ash::ShelfViewTestAPI(shelf_view).RunMessageLoopUntilAnimationsDone();
-  ASSERT_GT(GetChromeIconBoundsForRootWindow(root).height(), 0);
+  ASSERT_GT(GetChromeIconBoundsInScreen(root).height(), 0);
 }
 
 // Launch a new browser window by left-clicking the browser shortcut item.
 void OpenBrowserUsingShelfOnRootWindow(aura::Window* root) {
   ui::test::EventGenerator generator(root);
-  gfx::Point center = GetChromeIconBoundsForRootWindow(root).CenterPoint();
+  gfx::Point center = GetChromeIconBoundsInScreen(root).CenterPoint();
   generator.MoveMouseTo(center);
   generator.ClickLeftButton();
   // Ash notifies Chrome that the browser shortcut item was selected.
@@ -63,7 +62,7 @@ void OpenBrowserUsingShelfOnRootWindow(aura::Window* root) {
 // Launch a new browser window by clicking the "New window" context menu item.
 void OpenBrowserUsingContextMenuOnRootWindow(aura::Window* root) {
   ui::test::EventGenerator generator(root);
-  gfx::Point chrome_icon = GetChromeIconBoundsForRootWindow(root).CenterPoint();
+  gfx::Point chrome_icon = GetChromeIconBoundsInScreen(root).CenterPoint();
   generator.MoveMouseTo(chrome_icon);
   generator.PressRightButton();
 

chromecast/graphics/accessibility/partial_magnification_controller_unittest.cc

@@ -5,7 +5,6 @@
 #include "chromecast/graphics/accessibility/partial_magnification_controller.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/default_event_generator_delegate.h"
 #include "ui/aura/test/test_window_delegate.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/test/event_generator.h"
@@ -32,25 +31,6 @@ class CastTestWindowDelegate : public aura::test::TestWindowDelegate {
   DISALLOW_COPY_AND_ASSIGN(CastTestWindowDelegate);
 };
 
-class TestEventGeneratorDelegate
-    : public aura::test::DefaultEventGeneratorDelegate {
- public:
-  explicit TestEventGeneratorDelegate(aura::Window* root_window)
-      : DefaultEventGeneratorDelegate(root_window), root_window_(root_window) {}
-  ~TestEventGeneratorDelegate() override = default;
-
-  // aura::test::DefaultEventGeneratorDelegate:
-  aura::client::ScreenPositionClient* GetScreenPositionClient(
-      const aura::Window* window) const override {
-    return aura::client::GetScreenPositionClient(root_window_);
-  }
-
- private:
-  aura::Window* root_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestEventGeneratorDelegate);
-};
-
 // Wrapper for PartialMagnificationController that exposes internal state to
 // test functions.
 class PartialMagnificationControllerTestApi {
@@ -109,8 +89,8 @@ class PartialMagnificationControllerTest : public aura::test::AuraTestBase {
 
   ui::test::EventGenerator& GetEventGenerator() {
     if (!event_generator_) {
-      event_generator_ = std::make_unique<ui::test::EventGenerator>(
-          std::make_unique<TestEventGeneratorDelegate>(root_window()));
+      event_generator_ =
+          std::make_unique<ui::test::EventGenerator>(root_window());
     }
     return *event_generator_.get();
   }

chromecast/graphics/gestures/side_swipe_detector_test.cc

@@ -12,7 +12,6 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/test/aura_test_base.h"
-#include "ui/aura/test/default_event_generator_delegate.h"
 #include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/wm/core/default_screen_position_client.h"
@@ -35,25 +34,6 @@ constexpr int kNumSteps = 5;
 
 }  // namespace
 
-class TestEventGeneratorDelegate
-    : public aura::test::DefaultEventGeneratorDelegate {
- public:
-  explicit TestEventGeneratorDelegate(aura::Window* root_window)
-      : DefaultEventGeneratorDelegate(root_window), root_window_(root_window) {}
-  ~TestEventGeneratorDelegate() override = default;
-
-  // aura::test::DefaultEventGeneratorDelegate:
-  aura::client::ScreenPositionClient* GetScreenPositionClient(
-      const aura::Window* window) const override {
-    return aura::client::GetScreenPositionClient(root_window_);
-  }
-
- private:
-  aura::Window* root_window_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestEventGeneratorDelegate);
-};
-
 class MockCastGestureHandler : public CastGestureHandler {
  public:
   ~MockCastGestureHandler() override = default;
@@ -148,8 +128,8 @@ class SideSwipeDetectorTest : public aura::test::AuraTestBase {
 
   ui::test::EventGenerator& GetEventGenerator() {
     if (!event_generator_) {
-      event_generator_ = std::make_unique<ui::test::EventGenerator>(
-          std::make_unique<TestEventGeneratorDelegate>(root_window()));
+      event_generator_ =
+          std::make_unique<ui::test::EventGenerator>(root_window());
     }
     return *event_generator_.get();
   }

ui/aura/test/default_event_generator_delegate.cc

@@ -4,6 +4,7 @@
 
 #include "ui/aura/test/default_event_generator_delegate.h"
 
+#include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 
@@ -22,7 +23,7 @@ ui::EventTarget* DefaultEventGeneratorDelegate::GetTargetAt(
 client::ScreenPositionClient*
 DefaultEventGeneratorDelegate::GetScreenPositionClient(
     const Window* window) const {
-  return nullptr;
+  return client::GetScreenPositionClient(root_window_);
 }
 
 }  // namespace test

ui/views/widget/widget_interactive_uitest.cc

@@ -1177,7 +1177,8 @@ TEST_F(WidgetTestInteractive, TouchSelectionQuickMenuIsNotActivated) {
   RunPendingMessages();
 
   ui::test::EventGenerator generator(GetRootWindow(widget));
-  generator.GestureTapAt(gfx::Point(10, 10));
+  generator.GestureTapAt(textfield->GetBoundsInScreen().origin() +
+                         gfx::Vector2d(10, 10));
   ShowQuickMenuImmediately(static_cast<TouchSelectionControllerImpl*>(
       textfield_test_api.touch_selection_controller()));