Resubmit "Start chromoting host in the service process though a method call"

remoting/jingle_glue/jingle_client.cc

Index: remoting/jingle_glue/jingle_client.cc
diff --git a/remoting/jingle_glue/jingle_client.cc b/remoting/jingle_glue/jingle_client.cc
index eb89e2181d8a88c5d4436b7d59c1a206998a2f38..b3ea334f1e5203e7cfd9247f7a19a271ee0679b5 100644
--- a/remoting/jingle_glue/jingle_client.cc
+++ b/remoting/jingle_glue/jingle_client.cc
@@ -76,6 +76,11 @@ void JingleClient::DoConnect(scoped_refptr<JingleChannel> channel,
 }
 
 void JingleClient::Close() {
+  // Once we are closed we really shouldn't talk to the callback again. In the
+  // case when JingleClient outlives the owner access the callback is not safe.
+  // TODO(hclam): We need to lock to reset callback.
+  callback_ = NULL;
+
   message_loop()->PostTask(
       FROM_HERE, NewRunnableMethod(this, &JingleClient::DoClose));
 }
@@ -85,12 +90,14 @@ void JingleClient::DoClose() {
 
   // If we have not yet initialized and the client is already closed then
   // don't close again.
-  if (!callback_ || state_ == CLOSED)
+  if (state_ == CLOSED)
     return;
 
-  client_->Disconnect();
-  // Client is deleted by TaskRunner.
-  client_ = NULL;
+  if (client_) {
+    client_->Disconnect();
+    // Client is deleted by TaskRunner.
+    client_ = NULL;
+  }
   tunnel_session_client_.reset();
   port_allocator_.reset();
   session_manager_.reset();