Changes ownership of WindowTreeClient

ash/mus/test/wm_test_helper.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/test/wm_test_helper.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/test/wm_test_screen.h"
@@ skipping 39 matching lines @@
   // Offset the height slightly to give a different work area. -20 is arbitrary,
   // it could be anything.
   const gfx::Rect work_area(0, 0, display_bounds.width(),
                             display_bounds.height() - 20);
   display.set_work_area(work_area);
   window_tree_client_setup_.InitForWindowManager(
       window_manager_app_->window_manager_.get(),
       window_manager_app_->window_manager_.get(), display);
 
   window_manager_app_->InitWindowManager(
-      window_tree_client_setup_.window_tree_client());
+      window_tree_client_setup_.OwnWindowTreeClient());
+  ui::WindowTreeClient* window_tree_client =
+      window_manager_app_->window_manager()->window_tree_client();
 
   screen_->display_list()->AddDisplay(display,
                                       views::DisplayList::Type::PRIMARY);
 
-  ui::WindowTreeClientPrivate(window_tree_client_setup_.window_tree_client())
+  ui::WindowTreeClientPrivate(window_tree_client)
       .CallWmNewDisplayAdded(display);
 }
 
 }  // namespace mus
 }  // namespace ash