services/shell: Fix running the connection-lost callback.

content/common/mojo/embedded_application_runner.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 "content/common/mojo/embedded_application_runner.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 18 matching lines @@
     // different from the one that created it.
     thread_checker_.DetachFromThread();
   }
 
   void BindShellClientRequest(shell::mojom::ShellClientRequest request) {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     if (!shell_client_)
       shell_client_ = factory_callback_.Run();
 
-    std::unique_ptr<shell::ShellConnection> new_connection(
-        new shell::ShellConnection(shell_client_.get(), std::move(request)));
-    new_connection->set_connection_lost_closure(
-        base::Bind(&Instance::OnShellConnectionLost,
-                   base::Unretained(this), new_connection.get()));
-    shell_connections_.push_back(std::move(new_connection));
+    shell::ShellConnection* new_connection =
+        new shell::ShellConnection(shell_client_.get(), std::move(request));
+    shell_connections_.push_back(base::WrapUnique(new_connection));
+    new_connection->SetConnectionLostClosure(
+        base::Bind(&Instance::OnShellConnectionLost, base::Unretained(this),
+                   new_connection));
   }
 
  private:
   friend class base::RefCountedThreadSafe<Instance>;
 
   ~Instance() { DCHECK(thread_checker_.CalledOnValidThread()); }
 
   void OnShellConnectionLost(shell::ShellConnection* connection) {
     DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 46 matching lines @@
 void EmbeddedApplicationRunner::SetQuitClosure(
     const base::Closure& quit_closure) {
   quit_closure_ = quit_closure;
 }
 
 void EmbeddedApplicationRunner::OnQuit() {
   quit_closure_.Run();
 }
 
 }  // namespace content