Eliminate WindowTreeConnection

mash/browser/browser.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/browser/browser.h"
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/cpp/window.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/paint_throbber.h"
@@ skipping 196 matching lines @@
       int width = local_bounds.width();
       int height = local_bounds.height() - y;
       content_area_->SetBounds(
           gfx::Rect(offset.x(), offset.y(), width, height));
     }
   }
   void ViewHierarchyChanged(
       const views::View::ViewHierarchyChangedDetails& details) override {
     if (details.is_add && GetWidget() && !content_area_) {
       mus::Window* window = aura::GetMusWindow(GetWidget()->GetNativeWindow());
-      content_area_ = window->connection()->NewWindow(nullptr);
+      content_area_ = window->window_tree()->NewWindow(nullptr);
       window->AddChild(content_area_);
 
       mus::mojom::WindowTreeClientPtr client;
       view_->GetWindowTreeClient(GetProxy(&client));
       content_area_->Embed(std::move(client));
     }
   }
 
   // Overridden from views::TextFieldController:
   bool HandleKeyEvent(views::Textfield* sender,
@@ skipping 123 matching lines @@
   AddWindow(window);
 }
 
 void Browser::Create(shell::Connection* connection,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace browser
 }  // namespace mash