Changes ownership of WindowTreeClient

services/ui/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 "services/ui/demo/mus_demo.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/ui/demo/bitmap_uploader.h"
 #include "services/ui/public/cpp/gpu_service.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/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"
@@ skipping 36 matching lines @@
                       -SkFloatToScalar(canvas_size.height() * 0.5f));
   }
 
   canvas->drawRect(rect, paint);
 }
 
 }  // namespace
 
 MusDemo::MusDemo() {}
 
-MusDemo::~MusDemo() {
-  delete window_tree_client_;
-}
+MusDemo::~MusDemo() {}
 
 void MusDemo::OnStart(const shell::Identity& identity) {
   gpu_service_ = GpuService::Create(connector());
-  window_tree_client_ = new WindowTreeClient(this, this, nullptr);
+  window_tree_client_ = base::MakeUnique<WindowTreeClient>(this, this);
   window_tree_client_->ConnectAsWindowManager(connector());
 }
 
 bool MusDemo::OnConnect(const shell::Identity& remote_identity,
                         shell::InterfaceRegistry* registry) {
   return true;
 }
 
 void MusDemo::OnEmbed(Window* window) {
   // Not called for the WindowManager.
   NOTREACHED();
 }
 
-void MusDemo::OnDidDestroyClient(WindowTreeClient* client) {
-  window_tree_client_ = nullptr;
+void MusDemo::OnEmbedRootDestroyed(Window* root) {
+  // Not called for the WindowManager.
+  NOTREACHED();
+}
+
+void MusDemo::OnLostConnection(WindowTreeClient* client) {
+  window_ = nullptr;
+  window_tree_client_.reset();
   timer_.Stop();
 }
 
 void MusDemo::OnPointerEventObserved(const PointerEvent& event,
                                      Window* target) {}
 
 void MusDemo::SetWindowManagerClient(WindowManagerClient* client) {}
 
 bool MusDemo::OnWmSetBounds(Window* window, gfx::Rect* bounds) {
   return true;
@@ skipping 14 matching lines @@
     const std::set<Window*>& client_windows,
     bool janky) {
   // Don't care
 }
 
 void MusDemo::OnWmNewDisplay(Window* window, const display::Display& display) {
   DCHECK(!window_);  // Only support one display.
   window_ = window;
 
   // Initialize bitmap uploader for sending frames to MUS.
-  uploader_.reset(new ui::BitmapUploader(window_));
+  uploader_.reset(new BitmapUploader(window_));
   uploader_->Init(gpu_service_.get());
 
   // 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::OnWmPerformMoveLoop(Window* window,
                                   mojom::MoveLoopSource source,
@@ skipping 40 matching lines @@
   bitmap_.lockPixels();
   const unsigned char* addr =
       static_cast<const unsigned char*>(bitmap_.getPixels());
   const int bytes = bounds.width() * bounds.height() * 4;
   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),
-                       ui::BitmapUploader::BGRA);
+                       BitmapUploader::BGRA);
 }
 
 }  // namespace demo
 }  // namespace ui