Fix destruction order in XmppSignalStrategy.

remoting/jingle_glue/xmpp_signal_strategy.cc

 // Copyright (c) 2012 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 "remoting/jingle_glue/xmpp_signal_strategy.h"
 
 #include "base/bind.h"
+#include "base/location.h"
 #include "base/logging.h"
+#include "base/single_thread_task_runner.h"
 #include "base/string_util.h"
+#include "base/thread_task_runner_handle.h"
 #include "jingle/glue/chrome_async_socket.h"
 #include "jingle/glue/task_pump.h"
 #include "jingle/glue/xmpp_client_socket_factory.h"
 #include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "third_party/libjingle/source/talk/base/thread.h"
 #include "third_party/libjingle/source/talk/xmpp/prexmppauth.h"
 #include "third_party/libjingle/source/talk/xmpp/saslcookiemechanism.h"
 
@@ skipping 28 matching lines @@
      auth_token_(auth_token),
      auth_token_service_(auth_token_service),
      resource_name_(kDefaultResourceName),
      xmpp_client_(NULL),
      state_(DISCONNECTED),
      error_(OK) {
 }
 
 XmppSignalStrategy::~XmppSignalStrategy() {
   Disconnect();
+
+  // Destroying task runner will destroy XmppClient, but XmppClient may be on
+  // the stack and it doesn't handle this case properly, so we need to delay
+  // destruction.
+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(
+      FROM_HERE, task_runner_.release());
 }
 
 void XmppSignalStrategy::Connect() {
   DCHECK(CalledOnValidThread());
 
   // Disconnect first if we are currently connected.
   Disconnect();
 
   buzz::XmppClientSettings settings;
   buzz::Jid login_jid(username_);
@@ skipping 165 matching lines @@
   std::string mechanism = notifier::GaiaTokenPreXmppAuth::kDefaultAuthMechanism;
   if (settings.token_service() == "oauth2") {
     mechanism = "X-OAUTH2";
   }
 
   return new notifier::GaiaTokenPreXmppAuth(
       jid.Str(), settings.auth_token(), settings.token_service(), mechanism);
 }
 
 }  // namespace remoting