Eliminate WindowTreeConnection

components/mus/demo/mus_demo.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 "components/mus/demo/mus_demo.h"
 
 #include "base/time/time.h"
 #include "components/bitmap_uploader/bitmap_uploader.h"
-#include "components/mus/public/cpp/window_tree_connection.h"
+#include "components/mus/public/cpp/window_tree_client.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImageInfo.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkRect.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mus_demo {
 
 namespace {
@@ skipping 60 matching lines @@
   uploader_->Init(connector_);
 
   // Draw initial frame and start the timer to regularly draw frames.
   DrawFrame();
   timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(kFrameDelay),
                base::Bind(&MusDemo::DrawFrame, base::Unretained(this)));
 }
 
 void MusDemo::OnUnembed(mus::Window* root) {}
 
-void MusDemo::OnConnectionLost(mus::WindowTreeConnection* connection) {
+void MusDemo::OnWindowTreeClientDestroyed(mus::WindowTreeClient* client) {
   timer_.Stop();
 }
 
 void MusDemo::OnEventObserved(const ui::Event& event, mus::Window* target) {}
 
 // mus::mojom::WindowManagerFactory:
 void MusDemo::CreateWindowManager(mus::mojom::DisplayPtr display,
                                   mus::mojom::WindowTreeClientRequest request) {
-  mus::WindowTreeConnection::CreateForWindowManager(
-      this, std::move(request),
-      mus::WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED, this);
+  new mus::WindowTreeClient(this, this, std::move(request));
 }
 
 // mus::WindowManagerDelegate:
 void MusDemo::SetWindowManagerClient(mus::WindowManagerClient* client) {
   window_manager_client_ = client;
 }
 
 bool MusDemo::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
   return true;
 }
@@ skipping 59 matching lines @@
   std::unique_ptr<std::vector<unsigned char>> data(
       new std::vector<unsigned char>(addr, addr + bytes));
   bitmap_.unlockPixels();
 
   // Send frame to MUS via BitmapUploader.
   uploader_->SetBitmap(bounds.width(), bounds.height(), std::move(data),
                        bitmap_uploader::BitmapUploader::BGRA);
 }
 
 }  // namespace mus_demo