Changes ownership of WindowTreeClient

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

Index: services/ui/public/cpp/tests/test_window_tree_client_setup.h
diff --git a/services/ui/public/cpp/tests/test_window_tree_client_setup.h b/services/ui/public/cpp/tests/test_window_tree_client_setup.h
index 04f3961bd5a89fed4b5045ba92a8a9aa2c4327df..90a280159a9a47e3a149fd9beb75b382ad64d906 100644
--- a/services/ui/public/cpp/tests/test_window_tree_client_setup.h
+++ b/services/ui/public/cpp/tests/test_window_tree_client_setup.h
@@ -37,6 +37,9 @@ class TestWindowTreeClientSetup : public ui::WindowTreeClientObserver {
   // The WindowTree that WindowTreeClient talks to.
   TestWindowTree* window_tree() { return window_tree_.get(); }
 
+  // Returns ownership of WindowTreeClient to the caller.
+  std::unique_ptr<WindowTreeClient> OwnWindowTreeClient();
+
   WindowTreeClient* window_tree_client();
 
  private:
@@ -44,14 +47,8 @@ class TestWindowTreeClientSetup : public ui::WindowTreeClientObserver {
   void CommonInit(WindowTreeClientDelegate* window_tree_delegate,
                   WindowManagerDelegate* window_manager_delegate);
 
-  // ui::WindowTreeClientObserver:
-  void OnDidDestroyClient(ui::WindowTreeClient* client) override;
-
   std::unique_ptr<TestWindowTree> window_tree_;
 
-  // See description of WindowTreeClientDelegate for details on ownership. The
-  // WindowTreeClient may be deleted during shutdown by the test. If not,
-  // we own it and must delete it.
   std::unique_ptr<WindowTreeClient> window_tree_client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowTreeClientSetup);