Changes ownership of WindowTreeClient

ash/mus/window_manager_application.cc

 // Copyright 2015 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 "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/wm_shell.h"
@@ skipping 78 matching lines @@
 #endif
   ShutdownComponents();
 }
 
 void WindowManagerApplication::OnAcceleratorRegistrarDestroyed(
     AcceleratorRegistrarImpl* registrar) {
   accelerator_registrars_.erase(registrar);
 }
 
 void WindowManagerApplication::InitWindowManager(
-    ui::WindowTreeClient* window_tree_client) {
+    std::unique_ptr<ui::WindowTreeClient> window_tree_client) {
   InitializeComponents();
 #if defined(OS_CHROMEOS)
   // TODO(jamescook): Refactor StatisticsProvider so we can get just the data
   // we need in ash. Right now StatisticsProviderImpl launches the crossystem
   // binary to get system data, which we don't want to do twice on startup.
   statistics_provider_.reset(
       new chromeos::system::ScopedFakeStatisticsProvider());
   statistics_provider_->SetMachineStatistic("initial_locale", "en-US");
   statistics_provider_->SetMachineStatistic("keyboard_layout", "");
 #endif
-  window_manager_->Init(window_tree_client);
+  window_manager_->Init(std::move(window_tree_client));
 }
 
 void WindowManagerApplication::OnStart(const shell::Identity& identity) {
   aura_init_.reset(new views::AuraInit(connector(), "ash_mus_resources.pak"));
   gpu_service_ = ui::GpuService::Create(connector());
   compositor_context_factory_.reset(
       new views::SurfaceContextFactory(gpu_service_.get()));
   aura::Env::GetInstance()->set_context_factory(
       compositor_context_factory_.get());
   window_manager_.reset(new WindowManager(connector()));
 
   MaterialDesignController::Initialize();
 
   tracing_.Initialize(connector(), identity.name());
 
-  ui::WindowTreeClient* window_tree_client = new ui::WindowTreeClient(
-      window_manager_.get(), window_manager_.get(), nullptr);
+  std::unique_ptr<ui::WindowTreeClient> window_tree_client =
+      base::MakeUnique<ui::WindowTreeClient>(window_manager_.get(),
+                                             window_manager_.get());
   window_tree_client->ConnectAsWindowManager(connector());
 
   native_widget_factory_mus_.reset(
       new NativeWidgetFactoryMus(window_manager_.get()));
 
-  InitWindowManager(window_tree_client);
+  InitWindowManager(std::move(window_tree_client));
 }
 
 bool WindowManagerApplication::OnConnect(const shell::Identity& remote_identity,
                                          shell::InterfaceRegistry* registry) {
   registry->AddInterface<ash::mojom::ShelfController>(this);
   registry->AddInterface<ui::mojom::AcceleratorRegistrar>(this);
   if (remote_identity.name() == "mojo:mash_session") {
     connector()->ConnectToInterface(remote_identity, &session_);
     session_->AddScreenlockStateListener(
         screenlock_state_listener_binding_.CreateInterfacePtrAndBind());
@@ skipping 28 matching lines @@
       base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed,
                  base::Unretained(this))));
 }
 
 void WindowManagerApplication::ScreenlockStateChanged(bool locked) {
   window_manager_->SetScreenLocked(locked);
 }
 
 }  // namespace mus
 }  // namespace ash