Revert 55507 - Start chromoting host in the service process though a method ...

remoting/jingle_glue/jingle_client.cc

 // Copyright (c) 2010 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.
 
 // TODO(ajwong): We assign and read from a few of the member variables on
 // two threads. We need to audit this for thread safety.
 
 #include "remoting/jingle_glue/jingle_client.h"
 
 #include "base/logging.h"
@@ skipping 58 matching lines @@
   DCHECK_EQ(message_loop(), MessageLoop::current());
 
   talk_base::StreamInterface* stream =
       tunnel_session_client_->CreateTunnel(buzz::Jid(host_jid), "");
   DCHECK(stream != NULL);
 
   channel->Init(thread_, stream, host_jid);
 }
 
 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));
 }
 
 void JingleClient::DoClose() {
   DCHECK_EQ(message_loop(), MessageLoop::current());
 
   // If we have not yet initialized and the client is already closed then
   // don't close again.
-  if (state_ == CLOSED)
+  if (!callback_ || state_ == CLOSED)
     return;
 
-  if (client_) {
-    client_->Disconnect();
-    // Client is deleted by TaskRunner.
-    client_ = NULL;
-  }
+  client_->Disconnect();
+  // Client is deleted by TaskRunner.
+  client_ = NULL;
   tunnel_session_client_.reset();
   port_allocator_.reset();
   session_manager_.reset();
   network_manager_.reset();
   UpdateState(CLOSED);
 }
 
 void JingleClient::DoInitialize(const std::string& username,
                                 const std::string& auth_token,
                                 const std::string& auth_token_service) {
@@ skipping 116 matching lines @@
 }
 
 buzz::PreXmppAuth* JingleClient::CreatePreXmppAuth(
     const buzz::XmppClientSettings& settings) {
   buzz::Jid jid(settings.user(), settings.host(), buzz::STR_EMPTY);
   return new GaiaTokenPreXmppAuth(jid.Str(), settings.auth_cookie(),
                                   settings.token_service());
 }
 
 }  // namespace remoting