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

content/common/mojo/mojo_shell_connection_impl.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 "content/common/mojo/mojo_shell_connection_impl.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 71 matching lines @@
   return static_cast<MojoShellConnectionImpl*>(MojoShellConnection::Get());
 }
 
 void MojoShellConnectionImpl::BindToRequestFromCommandLine() {
   DCHECK(!shell_connection_);
   shell_connection_.reset(new shell::ShellConnection(
       this, shell::GetShellClientRequestFromCommandLine()));
 }
 
 MojoShellConnectionImpl::MojoShellConnectionImpl(bool external)
-    : external_(external) {}
+    : external_(external), connection_lost_(false) {}
 
 MojoShellConnectionImpl::~MojoShellConnectionImpl() {
   STLDeleteElements(&listeners_);
 }
 
 void MojoShellConnectionImpl::Initialize(shell::Connector* connector,
                                          const shell::Identity& identity,
                                          uint32_t id) {}
 
 bool MojoShellConnectionImpl::AcceptConnection(shell::Connection* connection) {
   bool found = false;
   for (auto listener : listeners_)
     found |= listener->AcceptConnection(connection);
   return found;
 }
 
+bool MojoShellConnectionImpl::ShellConnectionLost() {
+  connection_lost_ = true;
+  // Allow termination to proceed.
+  return true;
+}
+
 shell::Connector* MojoShellConnectionImpl::GetConnector() {
   DCHECK(shell_connection_);
   return shell_connection_->connector();
 }
 
 const shell::Identity& MojoShellConnectionImpl::GetIdentity() const {
   DCHECK(shell_connection_);
   return shell_connection_->identity();
 }
 
 bool MojoShellConnectionImpl::UsingExternalShell() const {
   return external_;
 }
 
 void MojoShellConnectionImpl::SetConnectionLostClosure(
     const base::Closure& closure) {
-  shell_connection_->set_connection_lost_closure(closure);
+  if (connection_lost_)
+    closure.Run();
+  else
+    shell_connection_->set_connection_lost_closure(closure);

[sadrul, 2016/04/27 20:00:38]

Alternatively, ShellConnection::set_connection_lost_closure could become
SetConnectionLostClosure() and do this instead.

[sky, 2016/04/27 21:18:56]

I would add this to ShellConnection as it seems easy to miss and I suspect
others will want this behavior too.

[sadrul, 2016/04/27 22:11:18]

Done.

 }
 
 void MojoShellConnectionImpl::AddListener(std::unique_ptr<Listener> listener) {
   DCHECK(std::find(listeners_.begin(), listeners_.end(), listener.get()) ==
          listeners_.end());
   listeners_.push_back(listener.release());
 }
 
 std::unique_ptr<MojoShellConnection::Listener>
 MojoShellConnectionImpl::RemoveListener(Listener* listener) {
@@ skipping 11 matching lines @@
 // static
 void MojoShellConnection::Destroy() {
   // This joins the shell controller thread.
   delete Get();
   lazy_tls_ptr.Pointer()->Set(nullptr);
 }
 
 MojoShellConnection::~MojoShellConnection() {}
 
 }  // namespace content