Fix crash when user disconnects It2Me host

remoting/signaling/delegating_signal_strategy.cc

 // Copyright 2013 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/signaling/delegating_signal_strategy.h"
 
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
 #include "third_party/libjingle_xmpp/xmpp/constants.h"
 
 namespace remoting {
 
 DelegatingSignalStrategy::DelegatingSignalStrategy(
     std::string local_jid,
     scoped_refptr<base::SingleThreadTaskRunner> client_task_runner,
-    const SendIqCallback& send_iq_callback)
+    const IqCallback& send_iq_callback)
     : local_jid_(local_jid),
       delegate_task_runner_(base::ThreadTaskRunnerHandle::Get()),
       client_task_runner_(client_task_runner),
       send_iq_callback_(send_iq_callback),
       weak_factory_(this) {}
 
 DelegatingSignalStrategy::~DelegatingSignalStrategy() {}
 
+DelegatingSignalStrategy::IqCallback
+DelegatingSignalStrategy::MakeIncomingMessageCallback() {
+  return base::Bind(&OnIncomingMessageFromDelegate, weak_factory_.GetWeakPtr(),

[Sergey Ulanov, 2017/03/14 19:20:59]

use base::BindRepeating() please

(base::Bind is being replaced with BindOnce and BindRepeating)

[kelvinp, 2017/03/15 21:56:46]

Done.

+                    client_task_runner_);
+}
+
+// static
+void DelegatingSignalStrategy::OnIncomingMessageFromDelegate(
+    base::WeakPtr<DelegatingSignalStrategy> weak_ptr,
+    scoped_refptr<base::SingleThreadTaskRunner> client_task_runner,
+    const std::string& message) {
+  DCHECK(!client_task_runner->BelongsToCurrentThread());
+  client_task_runner->PostTask(
+      FROM_HERE, base::Bind(&DelegatingSignalStrategy::OnIncomingMessage,

[Sergey Ulanov, 2017/03/14 19:20:59]

BindOnce

[kelvinp, 2017/03/15 21:56:46]

We can't migrate yet as PostTask() expects a Closure which is still typedef to
RepeatingCallback.

+                            weak_ptr, message));
+}
+
 void DelegatingSignalStrategy::OnIncomingMessage(const std::string& message) {
-  if (!client_task_runner_->BelongsToCurrentThread()) {
-    client_task_runner_->PostTask(
-        FROM_HERE, base::Bind(&DelegatingSignalStrategy::OnIncomingMessage,
-                              weak_factory_.GetWeakPtr(), message));
-    return;
-  }
-
+  DCHECK(client_task_runner_->BelongsToCurrentThread());
   std::unique_ptr<buzz::XmlElement> stanza(buzz::XmlElement::ForStr(message));
   if (!stanza.get()) {
     LOG(WARNING) << "Malformed XMPP stanza received: " << message;
     return;
   }
 
   for (auto& listener : listeners_) {
     if (listener.OnSignalStrategyIncomingStanza(stanza.get()))
       break;
   }
@@ skipping 41 matching lines @@
   delegate_task_runner_->PostTask(FROM_HERE,
                                   base::Bind(send_iq_callback_, stanza->Str()));
   return true;
 }
 
 std::string DelegatingSignalStrategy::GetNextId() {
   return base::Uint64ToString(base::RandUint64());
 }
 
 }  // namespace remoting