Changes ownership of WindowTreeClient

services/ui/public/cpp/tests/test_window_tree_client_setup.cc

Index: services/ui/public/cpp/tests/test_window_tree_client_setup.cc
diff --git a/services/ui/public/cpp/tests/test_window_tree_client_setup.cc b/services/ui/public/cpp/tests/test_window_tree_client_setup.cc
index 994b207151a869005978c4f482f8a78c703d482d..19fb66e027457c9fb9e4b7704e8c0e0f83b9d489 100644
--- a/services/ui/public/cpp/tests/test_window_tree_client_setup.cc
+++ b/services/ui/public/cpp/tests/test_window_tree_client_setup.cc
@@ -13,12 +13,7 @@ namespace ui {
 
 TestWindowTreeClientSetup::TestWindowTreeClientSetup() {}
 
-TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {
-  std::unique_ptr<WindowTreeClient> window_tree_client =
-      std::move(window_tree_client_);
-  if (window_tree_client)
-    window_tree_client->RemoveObserver(this);
-}
+TestWindowTreeClientSetup::~TestWindowTreeClientSetup() {}
 
 void TestWindowTreeClientSetup::Init(
     WindowTreeClientDelegate* window_tree_delegate) {
@@ -36,6 +31,12 @@ void TestWindowTreeClientSetup::InitForWindowManager(
       .SetTreeAndClientId(window_tree_.get(), 1);
 }
 
+std::unique_ptr<WindowTreeClient>
+TestWindowTreeClientSetup::OwnWindowTreeClient() {
+  DCHECK(window_tree_client_);
+  return std::move(window_tree_client_);
+}
+
 WindowTreeClient* TestWindowTreeClientSetup::window_tree_client() {
   return window_tree_client_.get();
 }
@@ -46,14 +47,6 @@ void TestWindowTreeClientSetup::CommonInit(
   window_tree_.reset(new TestWindowTree);
   window_tree_client_.reset(new WindowTreeClient(
       window_tree_delegate, window_manager_delegate, nullptr));
-  static_cast<WindowTreeClient*>(window_tree_client_.get())
-      ->AddObserver(this);
-}
-
-void TestWindowTreeClientSetup::OnDidDestroyClient(
-    ui::WindowTreeClient* client) {
-  // See comment in header as to why we do this.
-  window_tree_client_.release();
 }
 
 }  // namespace ui