Eliminate WindowTreeConnection

services/navigation/view_impl.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 "services/navigation/view_impl.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 #include "url/gurl.h"
 
 namespace navigation {
 
@@ skipping 30 matching lines @@
   else
     web_view_->GetWebContents()->GetController().ReloadBypassingCache(true);
 }
 
 void ViewImpl::Stop() {
   web_view_->GetWebContents()->Stop();
 }
 
 void ViewImpl::GetWindowTreeClient(
     mus::mojom::WindowTreeClientRequest request) {
-  mus::WindowTreeConnection::Create(
-      this, std::move(request),
-      mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
+  new mus::WindowTreeClient(this, nullptr, std::move(request));
 }
 
 void ViewImpl::AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_rect,
                               bool user_gesture,
                               bool* was_blocked) {
   mojom::ViewClientPtr client;
   mojom::ViewPtr view;
@@ skipping 42 matching lines @@
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.delegate = this;
   params.native_widget = new views::NativeWidgetMus(
       widget_.get(), connector_, root, mus::mojom::SurfaceType::DEFAULT);
   widget_->Init(params);
   widget_->Show();
 }
 
-void ViewImpl::OnConnectionLost(mus::WindowTreeConnection* connection) {}
+void ViewImpl::OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) {}
 void ViewImpl::OnEventObserved(const ui::Event& event, mus::Window* target) {}
 
 views::View* ViewImpl::GetContentsView() {
   return web_view_;
 }
 
 views::Widget* ViewImpl::GetWidget() {
   return web_view_->GetWidget();
 }
 
 const views::Widget* ViewImpl::GetWidget() const {
   return web_view_->GetWidget();
 }
 
 }  // navigation