Use SignalingAddress in SignalStrategy insterface.

remoting/host/gcd_state_updater.cc

 // Copyright 2015 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/gcd_state_updater.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/strings/stringize_macros.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/logging.h"
+#include "remoting/signaling/signaling_address.h"
 
 namespace remoting {
 
 namespace {
 
 const int64_t kTimerIntervalMinMs = 1000;
 const int64_t kTimerIntervalMaxMs = 5 * 60 * 1000;  // 5 minutes
 
 }  // namespace
 
@@ skipping 45 matching lines @@
   // Ignore all XMPP stanzas.
   return false;
 }
 
 void GcdStateUpdater::OnPatchStateResult(GcdRestClient::Result result) {
   if (!timer_.IsRunning()) {
     return;
   }
 
   if (result == GcdRestClient::NETWORK_ERROR ||
-      pending_request_jid_ != signal_strategy_->GetLocalJid()) {
+      pending_request_jid_ != signal_strategy_->GetLocalAddress().jid()) {
     // Continue exponential backoff.
     return;
   }
 
   timer_.Stop();
   if (result == GcdRestClient::SUCCESS) {
     if (!on_update_successful_callback_.is_null()) {
       on_unknown_host_id_error_.Reset();
       base::ResetAndReturn(&on_update_successful_callback_).Run();
     }
@@ skipping 15 matching lines @@
   // This avoids having multiple outstanding requests, which would be
   // a problem since there's no guarantee that the reqests will
   // complete in order.
   if (gcd_rest_client_->HasPendingRequest()) {
     return;
   }
 
   // Construct an update to the remote state.
   std::unique_ptr<base::DictionaryValue> patch(new base::DictionaryValue);
   std::unique_ptr<base::DictionaryValue> base_state(new base::DictionaryValue);
-  pending_request_jid_ = signal_strategy_->GetLocalJid();
+  pending_request_jid_ = signal_strategy_->GetLocalAddress().jid();
   base_state->SetString("_jabberId", pending_request_jid_);
   base_state->SetString("_hostVersion", STRINGIZE(VERSION));
   patch->Set("base", std::move(base_state));
 
   // Send the update to GCD.
   gcd_rest_client_->PatchState(
       std::move(patch),
       base::Bind(&GcdStateUpdater::OnPatchStateResult, base::Unretained(this)));
 }
 
 }  // namespace remoting