Eliminate WindowTreeConnection

mash/wm/test/wm_test_base.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 "mash/wm/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "components/mus/public/cpp/property_type_converters.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/wm/root_window_controller.h"
 #include "mash/wm/test/wm_test_helper.h"
 #include "mash/wm/test/wm_test_screen.h"
 #include "mash/wm/window_manager.h"
 #include "mash/wm/window_manager_application.h"
 #include "ui/display/display.h"
 
 namespace mash {
 namespace wm {
 namespace {
@@ skipping 149 matching lines @@
   return window;
 }
 
 mus::Window* WmTestBase::CreateChildTestWindow(mus::Window* parent,
                                                const gfx::Rect& bounds) {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[mus::mojom::WindowManager::kWindowType_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(static_cast<int32_t>(
           MusWindowTypeFromWmWindowType(ui::wm::WINDOW_TYPE_NORMAL)));
   mus::Window* window =
-      GetRootsOrderedByDisplayId()[0]->root()->connection()->NewWindow(
+      GetRootsOrderedByDisplayId()[0]->root()->window_tree()->NewWindow(
           &properties);
   window->SetBounds(bounds);
   window->SetVisible(true);
   parent->AddChild(window);
   return window;
 }
 
 void WmTestBase::SetUp() {
   setup_called_ = true;
   test_helper_.reset(new WmTestHelper);
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
 }
 
 std::vector<RootWindowController*> WmTestBase::GetRootsOrderedByDisplayId() {
   std::set<RootWindowController*> roots =
       test_helper_->window_manager_app()->GetRootControllers();
   std::vector<RootWindowController*> ordered_roots;
   ordered_roots.insert(ordered_roots.begin(), roots.begin(), roots.end());
   std::sort(ordered_roots.begin(), ordered_roots.end(), &CompareByDisplayId);
   return ordered_roots;
 }
 
 }  // namespace wm
 }  // namespace mash