Changes ownership of WindowTreeHostConnection

components/mus/mus_app.cc

Index: components/mus/mus_app.cc
diff --git a/components/mus/mus_app.cc b/components/mus/mus_app.cc
index 3d9805157b42e0a6a35b98f6d527cf924cde20d1..60bda3392531de15042f301f5947a258004823ea 100644
--- a/components/mus/mus_app.cc
+++ b/components/mus/mus_app.cc
@@ -232,10 +232,11 @@ void MandolineUIServicesApp::CreateWindowTreeHost(
   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