Set the global reference in WMHelper ctor

Removed WMHelper::SetInstance and simplified the code a bit.

Bug: None
AX-Relnotes: n/a.
Change-Id: I2c09d7aad7e8dce20d11cd3618da7c5d6f22a07a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2285345Reviewed-by: Jun Mukai <mukai@chromium.org>
Reviewed-by: Daniel Nicoara <dnicoara@chromium.org>
Commit-Queue: Mitsuru Oshima <oshima@chromium.org>
Cr-Commit-Position: refs/heads/master@{#786459}

ash/public/cpp/external_arc/keyboard/arc_input_method_surface_manager_unittest.cc

@@ -42,11 +42,9 @@ class ArcInputMethodSurfaceManagerTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
     wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-    exo::WMHelper::SetInstance(wm_helper_.get());
   }
 
   void TearDown() override {
-    exo::WMHelper::SetInstance(nullptr);
     wm_helper_.reset();
     AshTestBase::TearDown();
   }

ash/public/cpp/external_arc/message_center/arc_notification_content_view_unittest.cc

@@ -126,7 +126,6 @@ class ArcNotificationContentViewTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
     wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-    exo::WMHelper::SetInstance(wm_helper_.get());
     DCHECK(exo::WMHelper::HasInstance());
 
     surface_manager_ = std::make_unique<ArcNotificationSurfaceManagerImpl>();
@@ -150,7 +149,6 @@ class ArcNotificationContentViewTest : public AshTestBase {
     surface_manager_.reset();
 
     DCHECK(exo::WMHelper::HasInstance());
-    exo::WMHelper::SetInstance(nullptr);
     wm_helper_.reset();
 
     AshTestBase::TearDown();

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_browsertest.cc

@@ -48,11 +48,9 @@ class ArcAccessibilityHelperBridgeBrowserTest : public InProcessBrowserTest {
         browser()->profile());
 
     wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-    exo::WMHelper::SetInstance(wm_helper_.get());
   }
 
   void TearDownOnMainThread() override {
-    exo::WMHelper::SetInstance(nullptr);
     wm_helper_.reset();
 
     ArcServiceManager::Get()

chrome/browser/chromeos/arc/instance_throttle/arc_pip_window_throttle_observer_unittest.cc

@@ -59,10 +59,9 @@ class ArcPipWindowThrottleObserverTest : public testing::Test {
     pip_container_ = aura::test::CreateTestWindowWithDelegate(
         &dummy_delegate_, ash::kShellWindowId_PipContainer, gfx::Rect(),
         nullptr);
+    wm_helper_ = std::make_unique<FakeWMHelper>();
     wm_helper()->SetPrimaryDisplayContainer(ash::kShellWindowId_PipContainer,
                                             pip_container_);
-    exo::WMHelper::SetInstance(wm_helper());
-
     // Set up PIP windows
     arc_window_ = aura::test::CreateTestWindowWithDelegate(
         &dummy_delegate_, 1, gfx::Rect(), nullptr);
@@ -74,12 +73,12 @@ class ArcPipWindowThrottleObserverTest : public testing::Test {
                                 static_cast<int>(ash::AppType::BROWSER));
   }
 
-  void TearDown() override { exo::WMHelper::SetInstance(nullptr); }
+  void TearDown() override { wm_helper_.reset(); }
 
  protected:
   ArcPipWindowThrottleObserver* observer() { return &pip_observer_; }
 
-  FakeWMHelper* wm_helper() { return &wm_helper_; }
+  FakeWMHelper* wm_helper() { return wm_helper_.get(); }
 
   aura::Window* pip_container() { return pip_container_; }
 
@@ -90,7 +89,7 @@ class ArcPipWindowThrottleObserverTest : public testing::Test {
  public:
   content::BrowserTaskEnvironment task_environment_;
   ArcPipWindowThrottleObserver pip_observer_;
-  FakeWMHelper wm_helper_;
+  std::unique_ptr<FakeWMHelper> wm_helper_;
   aura::test::TestWindowDelegate dummy_delegate_;
   aura::Window* pip_container_;
   aura::Window* arc_window_;

chrome/browser/chromeos/arc/intent_helper/custom_tab_session_impl_browsertest.cc

@@ -36,13 +36,11 @@ class CustomTabSessionImplTest : public InProcessBrowserTest,
 
   void SetUpOnMainThread() override {
     wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-    exo::WMHelper::SetInstance(wm_helper_.get());
     DCHECK(exo::WMHelper::HasInstance());
   }
 
   void TearDownOnMainThread() override {
     DCHECK(exo::WMHelper::HasInstance());
-    exo::WMHelper::SetInstance(nullptr);
     wm_helper_.reset();
   }
 

chrome/browser/chromeos/arc/tracing/arc_app_performance_tracing_test_helper.cc

@@ -26,7 +26,6 @@ void ArcAppPerformanceTracingTestHelper::SetUp(Profile* profile) {
   DCHECK(IsArcAllowedForProfile(profile));
   profile_ = profile;
   wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-  exo::WMHelper::SetInstance(wm_helper_.get());
   // Make sure it is accessible in test.
   if (!GetTracing()) {
     ArcAppPerformanceTracing::GetForBrowserContextForTesting(profile_);
@@ -36,7 +35,6 @@ void ArcAppPerformanceTracingTestHelper::SetUp(Profile* profile) {
 
 void ArcAppPerformanceTracingTestHelper::TearDown() {
   DCHECK(profile_);
-  exo::WMHelper::SetInstance(nullptr);
   wm_helper_.reset();
   profile_ = nullptr;
 }

chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

@@ -207,11 +207,9 @@ class ArcAppLauncherBrowserTest : public extensions::ExtensionBrowserTest {
 
     // Allows creation of windows.
     wm_helper_ = std::make_unique<exo::WMHelperChromeOS>();
-    exo::WMHelper::SetInstance(wm_helper_.get());
   }
 
   void TearDownOnMainThread() override {
-    exo::WMHelper::SetInstance(nullptr);
     wm_helper_.reset();
   }
 

chromecast/browser/exo/wayland_server_controller.cc

@@ -17,7 +17,6 @@ WaylandServerController::WaylandServerController(
     CastWindowManagerAura* window_manager) {
   wm_helper_ = std::make_unique<exo::CastWMHelper>(
       window_manager, static_cast<CastScreen*>(CastScreen::GetScreen()));
-  exo::WMHelper::SetInstance(wm_helper_.get());
   display_ = std::make_unique<exo::Display>();
   wayland_server_ = exo::wayland::Server::Create(display_.get());
   // Wayland server creation can fail if XDG_RUNTIME_DIR is not set correctly.
@@ -29,12 +28,6 @@ WaylandServerController::WaylandServerController(
   }
 }
 
-WaylandServerController::~WaylandServerController() {
-  wayland_watcher_.reset();
-  wayland_server_.reset();
-  display_.reset();
-  exo::WMHelper::SetInstance(nullptr);
-  wm_helper_.reset();
-}
+WaylandServerController::~WaylandServerController() {}
 
 }  // namespace chromecast

components/exo/server/wayland_server_controller.cc

@@ -32,24 +32,19 @@ WaylandServerController::CreateIfNecessary(
 }
 
 WaylandServerController::~WaylandServerController() {
-  // Delete the instance in the reversed order they are created.
-  wayland_watcher_.reset();
-  wayland_server_.reset();
-  display_.reset();
-  WMHelper::SetInstance(nullptr);
-  wm_helper_.reset();
 }
 
 WaylandServerController::WaylandServerController(
     std::unique_ptr<FileHelper> file_helper,
     std::unique_ptr<NotificationSurfaceManager> notification_surface_manager,
     std::unique_ptr<InputMethodSurfaceManager> input_method_surface_manager)
-    : wm_helper_(std::make_unique<WMHelperChromeOS>()) {
-  WMHelper::SetInstance(wm_helper_.get());
-  display_ = std::make_unique<Display>(std::move(notification_surface_manager),
-                                       std::move(input_method_surface_manager),
-                                       std::move(file_helper));
-  wayland_server_ = wayland::Server::Create(display_.get());
+    : wm_helper_(std::make_unique<WMHelperChromeOS>()),
+      display_(
+          std::make_unique<Display>(std::move(notification_surface_manager),
+                                    std::move(input_method_surface_manager),
+                                    std::move(file_helper))),
+
+      wayland_server_(wayland::Server::Create(display_.get())) {
   // Wayland server creation can fail if XDG_RUNTIME_DIR is not set correctly.
   if (wayland_server_) {
     wayland_watcher_ =

components/exo/test/exo_test_base.cc

@@ -40,11 +40,9 @@ ExoTestBase::~ExoTestBase() = default;
 void ExoTestBase::SetUp() {
   AshTestBase::SetUp();
   wm_helper_ = std::make_unique<WMHelperChromeOS>();
-  WMHelper::SetInstance(wm_helper_.get());
 }
 
 void ExoTestBase::TearDown() {
-  WMHelper::SetInstance(nullptr);
   wm_helper_.reset();
   AshTestBase::TearDown();
 }

components/exo/test/exo_test_base_views.cc

@@ -106,11 +106,9 @@ void ExoTestBaseViews::SetUp() {
   views::ViewsTestBase::SetUp();
 
   wm_helper_ = std::make_unique<WMHelperTester>(root_window());
-  WMHelper::SetInstance(wm_helper_.get());
 }
 
 void ExoTestBaseViews::TearDown() {
-  WMHelper::SetInstance(nullptr);
   wm_helper_.reset();
 
   views::ViewsTestBase::TearDown();

components/exo/wayland/clients/test/wayland_client_test_helper.cc

@@ -110,7 +110,6 @@ void WaylandClientTestHelper::SetUpOnUIThread(base::WaitableEvent* event) {
   ash_test_helper_->SetUp();
 
   wm_helper_ = std::make_unique<WMHelperChromeOS>();
-  WMHelper::SetInstance(wm_helper_.get());
   display_ = std::make_unique<Display>(nullptr, nullptr, nullptr);
   wayland_server_ = exo::wayland::Server::Create(display_.get());
   DCHECK(wayland_server_);
@@ -122,7 +121,6 @@ void WaylandClientTestHelper::TearDownOnUIThread(base::WaitableEvent* event) {
   wayland_watcher_.reset();
   wayland_server_.reset();
   display_.reset();
-  WMHelper::SetInstance(nullptr);
   wm_helper_.reset();
 
   ash::Shell::Get()->session_controller()->NotifyChromeTerminating();

components/exo/wm_helper.cc

@@ -27,14 +27,14 @@ void WMHelper::LifetimeManager::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-WMHelper::WMHelper() {}
-
-WMHelper::~WMHelper() {}
+WMHelper::WMHelper() {
+  DCHECK(!g_instance);
+  g_instance = this;
+}
 
-// static
-void WMHelper::SetInstance(WMHelper* helper) {
-  DCHECK_NE(!!helper, !!g_instance);
-  g_instance = helper;
+WMHelper::~WMHelper() {
+  DCHECK(g_instance);
+  g_instance = nullptr;
 }
 
 // static

components/exo/wm_helper.h

@@ -85,7 +85,6 @@ class WMHelper : public aura::client::DragDropDelegate {
   WMHelper();
   ~WMHelper() override;
 
-  static void SetInstance(WMHelper* helper);
   static WMHelper* GetInstance();
   static bool HasInstance();