Eliminate WindowTreeConnection

ui/views/mus/native_widget_mus_unittest.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 "ui/views/mus/native_widget_mus.h"
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "components/mus/public/cpp/property_type_converters.h"
-#include "components/mus/public/cpp/tests/window_tree_client_impl_private.h"
+#include "components/mus/public/cpp/tests/window_tree_client_private.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window.h"
 #include "ui/events/event.h"
 #include "ui/events/test/test_event_handler.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia.h"
@@ skipping 317 matching lines @@
   Widget::InitParams params = CreateParams(Widget::InitParams::TYPE_WINDOW);
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   widget.Init(params);
   widget.Show();
   mus::Window* window =
       static_cast<NativeWidgetMus*>(widget.native_widget_private())->window();
   ASSERT_TRUE(window->visible());
 
   // Create a child window, make it visible and parent it to the Widget's
   // window.
-  mus::Window* child_window = window->connection()->NewWindow();
+  mus::Window* child_window = window->window_tree()->NewWindow();
   child_window->SetVisible(true);
   window->AddChild(child_window);
 
   // Hide the child, this should not impact the visibility of the parent.
   child_window->SetVisible(false);
   EXPECT_TRUE(window->visible());
 }
 
 // Tests that child aura::Windows cannot be activated.
 TEST_F(NativeWidgetMusTest, FocusChildAuraWindow) {
@@ skipping 47 matching lines @@
   View* content = new HandleMousePressView;
   content->SetBounds(10, 20, 90, 180);
   widget->GetContentsView()->AddChildView(content);
 
   ui::test::TestEventHandler handler;
   content->AddPreTargetHandler(&handler);
 
   std::unique_ptr<ui::MouseEvent> mouse = CreateMouseEvent();
   NativeWidgetMus* native_widget =
       static_cast<NativeWidgetMus*>(widget->native_widget_private());
-  mus::WindowTreeClientImplPrivate test_api(native_widget->window());
+  mus::WindowTreeClientPrivate test_api(native_widget->window());
   test_api.CallOnWindowInputEvent(native_widget->window(), *mouse);
   EXPECT_EQ(1, handler.num_mouse_events());
 }
 
 // Tests that an incoming UI event is acked with the handled status.
 TEST_F(NativeWidgetMusTest, EventAcked) {
   std::unique_ptr<Widget> widget(CreateWidget(nullptr));
   widget->Show();
 
   View* content = new HandleMousePressView;
@@ skipping 85 matching lines @@
   mus_window->SetBounds(end_bounds);
 
   EXPECT_EQ(end_bounds, mus_window->bounds());
 
   // Main check for this test: Setting |mus_window| bounds while bypassing
   // |native_widget| must update window_tree_host bounds.
   EXPECT_EQ(end_bounds, native_widget->window_tree_host()->GetBounds());
 }
 
 }  // namespace views