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

services/shell/public/cpp/lib/shell_connection.cc

Index: services/shell/public/cpp/lib/shell_connection.cc
diff --git a/services/shell/public/cpp/lib/shell_connection.cc b/services/shell/public/cpp/lib/shell_connection.cc
index d1131283a19a05d83a786091db508a0a19437b37..216be40778526c3c9889e09c76f3061d00ea4e5c 100644
--- a/services/shell/public/cpp/lib/shell_connection.cc
+++ b/services/shell/public/cpp/lib/shell_connection.cc
@@ -22,7 +22,9 @@ namespace shell {
 
 ShellConnection::ShellConnection(shell::ShellClient* client,
                                  mojom::ShellClientRequest request)
-    : client_(client), binding_(this) {
+    : client_(client),
+      binding_(this),
+      should_run_connection_lost_closure_(false) {

[Ben Goodger (Google), 2016/04/27 22:29:20]

init in the header

[sadrul, 2016/04/27 22:45:10]

Done.

   mojom::ConnectorPtr connector;
   pending_connector_request_ = GetProxy(&connector);
   connector_.reset(new ConnectorImpl(std::move(connector)));
@@ -43,6 +45,13 @@ void ShellConnection::SetAppTestConnectorForTesting(
   connector_.reset(new ConnectorImpl(std::move(connector)));
 }
 
+void ShellConnection::SetConnectionLostClosure(const base::Closure& closure) {
+  connection_lost_closure_ = closure;
+  if (should_run_connection_lost_closure_ &&
+      !connection_lost_closure_.is_null())
+    connection_lost_closure_.Run();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // ShellConnection, mojom::ShellClient implementation:
 
@@ -87,7 +96,9 @@ void ShellConnection::OnConnectionError() {
   // Note that the ShellClient doesn't technically have to quit now, it may live
   // on to service existing connections. All existing Connectors however are
   // invalid.
-  if (client_->ShellConnectionLost() && !connection_lost_closure_.is_null())
+  should_run_connection_lost_closure_ = client_->ShellConnectionLost();
+  if (should_run_connection_lost_closure_ &&
+      !connection_lost_closure_.is_null())
     connection_lost_closure_.Run();
   // We don't reset the connector as clients may have taken a raw pointer to it.
   // Connect() will return nullptr if they try to connect to anything.