Changes ownership of WindowTreeClient

services/ui/test_wm/test_wm.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 <memory>
 #include <utility>
 
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/shell/public/c/main.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/service_runner.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "ui/display/display.h"
 
 namespace ui {
 namespace test {
 
 class TestWM : public shell::Service,
                public ui::WindowTreeClientDelegate,
                public ui::WindowManagerDelegate {
  public:
   TestWM() {}
-  ~TestWM() override { delete window_tree_client_; }
+  ~TestWM() override {}
 
  private:
   // shell::Service:
   void OnStart(const shell::Identity& identity) override {
-    window_tree_client_ = new ui::WindowTreeClient(this, this, nullptr);
+    window_tree_client_.reset(new ui::WindowTreeClient(this, this));
     window_tree_client_->ConnectAsWindowManager(connector());
   }
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override {
     // WindowTreeClients configured as the window manager should never get
     // OnEmbed().
     NOTREACHED();
   }
-  void OnDidDestroyClient(ui::WindowTreeClient* client) override {
-    window_tree_client_ = nullptr;
+  void OnLostConnection(WindowTreeClient* client) override {
+    window_tree_client_.reset();
+  }
+  void OnEmbedRootDestroyed(ui::Window* root) override {
+    // WindowTreeClients configured as the window manager should never get
+    // OnEmbedRootDestroyed().
+    NOTREACHED();
   }
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               ui::Window* target) override {
     // Don't care.
   }
 
   // ui::WindowManagerDelegate:
   void SetWindowManagerClient(ui::WindowManagerClient* client) override {
     window_manager_client_ = client;
   }
@@ skipping 33 matching lines @@
   void OnWmPerformMoveLoop(Window* window,
                            mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override {
     // Don't care.
   }
   void OnWmCancelMoveLoop(Window* window) override {}
 
   ui::Window* root_ = nullptr;
   ui::WindowManagerClient* window_manager_client_ = nullptr;
-  // See WindowTreeClient for details on ownership.
-  ui::WindowTreeClient* window_tree_client_ = nullptr;
+  std::unique_ptr<ui::WindowTreeClient> window_tree_client_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWM);
 };
 
 }  // namespace test
 }  // namespace ui
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   shell::ServiceRunner runner(new ui::test::TestWM);
   return runner.Run(service_request_handle);
 }