Fix crash when user disconnects It2Me host

remoting/host/it2me/it2me_native_messaging_host.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/host/it2me/it2me_native_messaging_host.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 278 matching lines @@
         net::ClientSocketFactory::GetDefaultFactory(),
         host_context_->url_request_context_getter(), xmpp_config));
   } else {
     std::string local_jid;
 
     if (!message->GetString("localJid", &local_jid)) {
       SendErrorAndExit(std::move(response), "'localJid' not found in request.");
       return;
     }
 
-    delegating_signal_strategy_ = new DelegatingSignalStrategy(
-        local_jid, host_context_->network_task_runner(),
-        base::Bind(&It2MeNativeMessagingHost::SendOutgoingIq,
-                   weak_factory_.GetWeakPtr()));
-    signal_strategy.reset(delegating_signal_strategy_);
+    DelegatingSignalStrategy* delegating_signal_strategy =

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

Use unique_ptr<> please:

  auto delegating_signal_strategy =
      base::MakeUnique<DelegatingSignalStrategy>(..);

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

Done.

+        new DelegatingSignalStrategy(
+            local_jid, host_context_->network_task_runner(),
+            base::Bind(&It2MeNativeMessagingHost::SendOutgoingIq,
+                       weak_factory_.GetWeakPtr()));
+    incoming_message_callback_ =
+        delegating_signal_strategy->MakeIncomingMessageCallback();
+    signal_strategy.reset(delegating_signal_strategy);

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

signal_strategy = std::move(delegating_signal_strategy);

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

Done.

   }
 
   std::string directory_bot_jid = service_urls->directory_bot_jid();
 
 #if !defined(NDEBUG)
   if (!message->GetString("directoryBotJid", &directory_bot_jid)) {
     SendErrorAndExit(std::move(response),
                      "'directoryBotJid' not found in request.");
     return;
   }
@@ skipping 36 matching lines @@
 
 void It2MeNativeMessagingHost::ProcessIncomingIq(
     std::unique_ptr<base::DictionaryValue> message,
     std::unique_ptr<base::DictionaryValue> response) {
   std::string iq;
   if (!message->GetString("iq", &iq)) {
     LOG(ERROR) << "Invalid incomingIq() data.";
     return;
   }
 
-  if (delegating_signal_strategy_)
-    delegating_signal_strategy_->OnIncomingMessage(iq);
+  incoming_message_callback_.Run(iq);
   SendMessageToClient(std::move(response));
 };
 
 void It2MeNativeMessagingHost::SendOutgoingIq(const std::string& iq) {
   std::unique_ptr<base::DictionaryValue> message(new base::DictionaryValue());
   message->SetString("iq", iq);
   message->SetString("type", "sendOutgoingIq");
   SendMessageToClient(std::move(message));
 }
 
@@ skipping 156 matching lines @@
 
 bool It2MeNativeMessagingHost::DelegateToElevatedHost(
     std::unique_ptr<base::DictionaryValue> message) {
   NOTREACHED();
   return false;
 }
 
 #endif  // !defined(OS_WIN)
 
 }  // namespace remoting