Provide a default activation client in AuraTestHelper.

A number of different tests want this, so provide it all the time.

Bug: none
Change-Id: I04b49b955621594b47ab74305c98abeb206532c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2121335
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Scott Violet <sky@chromium.org>
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#753427}

ash/app_list/app_list_presenter_impl_unittest.cc

@@ -22,7 +22,6 @@
 #include "ui/aura/window.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/test/test_views_delegate.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
@@ -112,7 +111,6 @@ AppListPresenterImplTest::~AppListPresenterImplTest() {}
 
 void AppListPresenterImplTest::SetUp() {
   AuraTestBase::SetUp();
-  new wm::DefaultActivationClient(root_window());
   container_.reset(CreateNormalWindow(kShellWindowId_AppListContainer,
                                       root_window(), nullptr));
   std::unique_ptr<AppListPresenterDelegateTest> presenter_delegate =

ash/keyboard/ui/keyboard_ui_controller_unittest.cc

@@ -38,7 +38,6 @@
 #include "ui/compositor/test/layer_animator_test_controller.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/default_screen_position_client.h"
 
 #if defined(USE_OZONE)
@@ -147,7 +146,6 @@ class KeyboardUIControllerTest : public aura::test::AuraTestBase,
 
   void SetUp() override {
     aura::test::AuraTestBase::SetUp();
-    new wm::DefaultActivationClient(root_window());
     focus_controller_ = std::make_unique<TestFocusController>(root_window());
     layout_delegate_ =
         std::make_unique<TestKeyboardLayoutDelegate>(root_window());

chrome/browser/ui/views/apps/shaped_app_window_targeter_unittest.cc

@@ -17,7 +17,6 @@
 #include "ui/events/event_utils.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/test/views_test_base.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/easy_resize_window_targeter.h"
 
 using extensions::AppWindow;
@@ -38,7 +37,6 @@ class ShapedAppWindowTargeterTest : public views::ViewsTestBase {
  protected:
   void SetUp() override {
     views::ViewsTestBase::SetUp();
-    new wm::DefaultActivationClient(root_window());
     widget_ = std::make_unique<views::Widget>();
     views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
     params.remove_standard_frame = true;

components/exo/test/exo_test_base_views.cc

@@ -9,7 +9,6 @@
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "ui/base/ime/init/input_method_factory.h"
 #include "ui/display/manager/managed_display_info.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/wm_core_switches.h"
 
 namespace exo {
@@ -105,8 +104,6 @@ ExoTestBaseViews::~ExoTestBaseViews() {}
 
 void ExoTestBaseViews::SetUp() {
   views::ViewsTestBase::SetUp();
-  // Takes care of its own lifetime.
-  new wm::DefaultActivationClient(root_window());
 
   wm_helper_ = std::make_unique<WMHelperTester>(root_window());
   WMHelper::SetInstance(wm_helper_.get());

content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

@@ -116,7 +116,6 @@
 #include "ui/events/test/event_generator.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/selection_bound.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/core/window_util.h"
 
@@ -498,7 +497,6 @@ class RenderWidgetHostViewAuraTest : public testing::Test {
     aura_test_helper_.reset(new aura::test::AuraTestHelper());
     aura_test_helper_->SetUp(
         ImageTransportFactory::GetInstance()->GetContextFactory());
-    new wm::DefaultActivationClient(aura_test_helper_->GetContext());
 
     browser_context_.reset(new TestBrowserContext);
     process_host_ = new MockRenderProcessHost(browser_context_.get());

content/public/test/test_renderer_host.cc

@@ -49,7 +49,6 @@
 
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
-#include "ui/wm/core/default_activation_client.h"
 #endif
 
 #if defined(OS_MACOSX)
@@ -246,7 +245,6 @@ void RenderViewHostTestHarness::SetUp() {
 
   aura_test_helper_.reset(new aura::test::AuraTestHelper());
   aura_test_helper_->SetUp(context_factory);
-  new wm::DefaultActivationClient(aura_test_helper_->GetContext());
 #endif
 
   sanity_checker_.reset(new ContentBrowserSanityChecker());

ui/aura/test/DEPS

@@ -4,5 +4,5 @@ include_rules = [
   "+mojo/core/embedder/embedder.h",
   "+services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h",
   "+ui/gl",
-  "+ui/wm/core/wm_state.h",
+  "+ui/wm/core",
 ]

ui/aura/test/aura_test_helper.cc

@@ -28,6 +28,7 @@
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/compositor/test/test_context_factories.h"
 #include "ui/display/screen.h"
+#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/wm_state.h"
 
 #if defined(OS_LINUX)
@@ -123,6 +124,7 @@ void AuraTestHelper::SetUp(ui::ContextFactory* context_factory) {
   host_->window()->SetEventTargeter(std::make_unique<WindowTargeter>());
 
   Window* root_window = GetContext();
+  new wm::DefaultActivationClient(root_window);  // Manages own lifetime.
   client::SetFocusClient(root_window, focus_client_.get());
   capture_client_ = std::make_unique<client::DefaultCaptureClient>(root_window);
   parenting_client_ = std::make_unique<TestWindowParentingClient>(root_window);

ui/snapshot/snapshot_aura_unittest.cc

@@ -34,7 +34,6 @@
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/transform.h"
 #include "ui/gl/gl_implementation.h"
-#include "ui/wm/core/default_activation_client.h"
 
 namespace ui {
 namespace {
@@ -111,7 +110,6 @@ class SnapshotAuraTest : public testing::TestWithParam<bool> {
 
     helper_ = std::make_unique<aura::test::AuraTestHelper>();
     helper_->SetUp(context_factories_->GetContextFactory());
-    new ::wm::DefaultActivationClient(root_window());
   }
 
   void TearDown() override {

ui/views/corewm/tooltip_controller_unittest.cc

@@ -36,7 +36,6 @@
 #include "ui/views/view.h"
 #include "ui/views/widget/tooltip_manager.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/default_screen_position_client.h"
 #include "ui/wm/public/tooltip_client.h"
 
@@ -91,9 +90,6 @@ class TooltipControllerTest : public ViewsTestBase {
     ViewsTestBase::SetUp();
 
     aura::Window* root_window = GetContext();
-
-    if (root_window)
-      new wm::DefaultActivationClient(root_window);
 #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || defined(OS_WIN)
     if (root_window) {
       tooltip_aura_ = new views::corewm::TooltipAura();
@@ -616,7 +612,6 @@ class TooltipControllerTest2 : public aura::test::AuraTestBase {
   void SetUp() override {
     at_exit_manager_ = std::make_unique<base::ShadowingAtExitManager>();
     aura::test::AuraTestBase::SetUp();
-    new wm::DefaultActivationClient(root_window());
     controller_ = std::make_unique<TooltipController>(
         std::unique_ptr<corewm::Tooltip>(test_tooltip_));
     root_window()->AddPreTargetHandler(controller_.get());
@@ -696,7 +691,6 @@ class TooltipControllerTest3 : public ViewsTestBase {
     ViewsTestBase::SetUp();
 
     aura::Window* root_window = GetContext();
-    new wm::DefaultActivationClient(root_window);
 
     widget_.reset(CreateWidget(root_window));
     widget_->SetContentsView(new View);

ui/views/test/views_test_helper_aura.cc

@@ -6,7 +6,6 @@
 
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/wm/core/capture_controller.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/default_screen_position_client.h"
 
 namespace views {
@@ -20,15 +19,11 @@ ViewsTestHelperAura::ViewsTestHelperAura() {
   aura_test_helper_.SetUp();
 
   gfx::NativeWindow root_window = GetContext();
-  if (root_window) {
-    new wm::DefaultActivationClient(root_window);
-
-    if (!aura::client::GetScreenPositionClient(root_window)) {
-      screen_position_client_ =
-          std::make_unique<wm::DefaultScreenPositionClient>();
-      aura::client::SetScreenPositionClient(root_window,
-                                            screen_position_client_.get());
-    }
+  if (root_window && !aura::client::GetScreenPositionClient(root_window)) {
+    screen_position_client_ =
+        std::make_unique<wm::DefaultScreenPositionClient>();
+    aura::client::SetScreenPositionClient(root_window,
+                                          screen_position_client_.get());
   }
 }
 

ui/wm/core/compound_event_filter_unittest.cc

@@ -17,7 +17,6 @@
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom/dom_code.h"
 #include "ui/events/test/event_generator.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace {
@@ -114,7 +113,6 @@ TEST_F(CompoundEventFilterTest, CursorVisibilityChange) {
 #if defined(OS_CHROMEOS) || defined(OS_WIN)
 // Touch visually hides the cursor on ChromeOS and Windows.
 TEST_F(CompoundEventFilterTest, TouchHidesCursor) {
-  new wm::DefaultActivationClient(root_window());
   std::unique_ptr<CompoundEventFilter> compound_filter(new CompoundEventFilter);
   aura::Env::GetInstance()->AddPreTargetHandler(compound_filter.get());
   aura::test::TestWindowDelegate delegate;

ui/wm/core/shadow_controller_unittest.cc

@@ -16,7 +16,6 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor_extra/shadow.h"
-#include "ui/wm/core/default_activation_client.h"
 #include "ui/wm/core/shadow_controller_delegate.h"
 #include "ui/wm/core/shadow_types.h"
 #include "ui/wm/core/window_util.h"
@@ -31,7 +30,6 @@ class ShadowControllerTest : public aura::test::AuraTestBase {
 
   void SetUp() override {
     AuraTestBase::SetUp();
-    new wm::DefaultActivationClient(root_window());
     InstallShadowController(nullptr);
   }
   void TearDown() override {