Remove calls to MessageLoop::current() in jingle.

jingle/notifier/base/xmpp_connection.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 "jingle/notifier/base/xmpp_connection.h"
 
 #include <stddef.h>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string_piece.h"
+#include "base/threading/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/weak_xmpp_client.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request_context.h"
 #include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 
 namespace notifier {
@@ skipping 52 matching lines @@
   // buzz::XmppClient::Connect() should never fail.
   DCHECK_EQ(connect_status, buzz::XMPP_RETURN_OK);
   weak_xmpp_client->Start();
   weak_xmpp_client_ = weak_xmpp_client->AsWeakPtr();
 }
 
 XmppConnection::~XmppConnection() {
   DCHECK(CalledOnValidThread());
   ClearClient();
   task_pump_->Stop();
-  base::MessageLoop* current_message_loop = base::MessageLoop::current();
-  CHECK(current_message_loop);
   // We do this because XmppConnection may get destroyed as a result
   // of a signal from XmppClient.  If we delete |task_pump_| here, bad
   // things happen when the stack pops back up to the XmppClient's
   // (which is deleted by |task_pump_|) function.
-  current_message_loop->DeleteSoon(FROM_HERE, task_pump_.release());
+  CHECK(base::ThreadTaskRunnerHandle::IsSet());

[Sergey Ulanov, 2016/06/20 22:53:25]

I don't think you need this CHECK(). There is DCHECK in
ThreadTaskRunnerHandle::Get().

[fdoray, 2016/06/21 13:01:51]

Done.

+  base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE,
+                                                  task_pump_.release());
 }
 
 void XmppConnection::OnStateChange(buzz::XmppEngine::State state) {
   DCHECK(CalledOnValidThread());
   VLOG(1) << "XmppClient state changed to " << state;
   if (!weak_xmpp_client_.get()) {
     LOG(DFATAL) << "weak_xmpp_client_ unexpectedly NULL";
     return;
   }
   if (!delegate_) {
@@ skipping 38 matching lines @@
 }
 
 void XmppConnection::ClearClient() {
   if (weak_xmpp_client_.get()) {
     weak_xmpp_client_->Invalidate();
     DCHECK(!weak_xmpp_client_.get());
   }
 }
 
 }  // namespace notifier