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

services/shell/public/cpp/shell_connection.h

 // 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.
 
 #ifndef SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 #define SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_
 
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 45 matching lines @@
   Connector* connector() { return connector_.get(); }
   const Identity& identity() { return identity_; }
 
   // TODO(rockot): Remove this. http://crbug.com/594852.
   void set_initialize_handler(const base::Closure& callback);
 
   // TODO(rockot): Remove this once we get rid of app tests.
   void SetAppTestConnectorForTesting(mojom::ConnectorPtr connector);
 
   // Specify a function to be called when the connection to the shell is lost.
-  void set_connection_lost_closure(const base::Closure& closure) {
-    connection_lost_closure_ = closure;
-  }
+  // Note that if connection has already been lost, then |closure| is called
+  // immediately.
+  void SetConnectionLostClosure(const base::Closure& closure);
 
  private:
   // mojom::ShellClient:
   void Initialize(mojom::IdentityPtr identity,
                   uint32_t id,
                   const InitializeCallback& callback) override;
   void AcceptConnection(mojom::IdentityPtr source,
                         uint32_t source_id,
                         mojom::InterfaceProviderRequest remote_interfaces,
                         mojom::InterfaceProviderPtr local_interfaces,
                         mojom::CapabilityRequestPtr allowed_capabilities,
                         const mojo::String& name) override;
 
   void OnConnectionError();
 
   // A callback called when Initialize() is run.
   base::Closure initialize_handler_;
 
   // We track the lifetime of incoming connection registries as it more
   // convenient for the client.
   ScopedVector<Connection> incoming_connections_;
 
   // A pending Connector request which will eventually be passed to the shell.
   mojom::ConnectorRequest pending_connector_request_;
 
   shell::ShellClient* client_;
   mojo::Binding<mojom::ShellClient> binding_;
   std::unique_ptr<Connector> connector_;
   shell::Identity identity_;
+  bool should_run_connection_lost_closure_ = false;
 
   base::Closure connection_lost_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellConnection);
 };
 
 }  // namespace shell
 
 #endif  // SERVICES_SHELL_PUBLIC_CPP_SHELL_CONNECTION_H_