Changes ownership of WindowTreeHostConnection

components/mus/mus_app.cc

 // Copyright 2014 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/mus_app.h"
 
 #include <set>
 
 #include "base/stl_util.h"
 #include "build/build_config.h"
@@ skipping 214 matching lines @@
 void MandolineUIServicesApp::CreateWindowTreeHost(
     mojo::InterfaceRequest<mojom::WindowTreeHost> host,
     mojom::WindowTreeClientPtr tree_client) {
   DCHECK(connection_manager_);
 
   // TODO(fsamuel): We need to make sure that only the window manager can create
   // new roots.
   ws::WindowTreeHostImpl* host_impl = new ws::WindowTreeHostImpl(
       connection_manager_.get(), connector_, gpu_state_, surfaces_state_);
 
-  // WindowTreeHostConnection manages its own lifetime.
-  host_impl->Init(new ws::WindowTreeHostConnectionImpl(
-      std::move(host), make_scoped_ptr(host_impl), std::move(tree_client),
-      connection_manager_.get()));
+  scoped_ptr<ws::WindowTreeHostConnectionImpl> host_connection(
+      new ws::WindowTreeHostConnectionImpl(std::move(host), host_impl,
+                                           std::move(tree_client),
+                                           connection_manager_.get()));
+  host_impl->Init(std::move(host_connection));
 }
 
 }  // namespace mus