Use SignalingAddress in SignalStrategy insterface.

remoting/signaling/fake_signal_strategy.cc

 // Copyright 2014 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/fake_signal_strategy.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
@@ skipping 10 matching lines @@
 
 // static
 void FakeSignalStrategy::Connect(FakeSignalStrategy* peer1,
                                  FakeSignalStrategy* peer2) {
   DCHECK(peer1->main_thread_->BelongsToCurrentThread());
   DCHECK(peer2->main_thread_->BelongsToCurrentThread());
   peer1->ConnectTo(peer2);
   peer2->ConnectTo(peer1);
 }
 
-FakeSignalStrategy::FakeSignalStrategy(const std::string& jid)
+FakeSignalStrategy::FakeSignalStrategy(const SignalingAddress& address)
     : main_thread_(base::ThreadTaskRunnerHandle::Get()),
-      jid_(jid),
+      address_(address),
       last_id_(0),
       weak_factory_(this) {
   DetachFromThread();
 }
 
 FakeSignalStrategy::~FakeSignalStrategy() {
   while (!received_messages_.empty()) {
     delete received_messages_.front();
     received_messages_.pop_front();
   }
 }
 
 void FakeSignalStrategy::ConnectTo(FakeSignalStrategy* peer) {
   PeerCallback peer_callback =
       base::Bind(&FakeSignalStrategy::DeliverMessageOnThread,
                  main_thread_,
                  weak_factory_.GetWeakPtr());
   if (peer->main_thread_->BelongsToCurrentThread()) {
     peer->SetPeerCallback(peer_callback);
   } else {
     peer->main_thread_->PostTask(
         FROM_HERE,
         base::Bind(&FakeSignalStrategy::SetPeerCallback,
                    base::Unretained(peer),
                    peer_callback));
   }
 }
 
-void FakeSignalStrategy::SetLocalJid(const std::string& jid) {
+void FakeSignalStrategy::SetLocalAddress(const SignalingAddress& address) {
   DCHECK(CalledOnValidThread());
-  jid_ = jid;
+  address_ = address;
 }
 
 void FakeSignalStrategy::SimulateMessageReordering() {
   DCHECK(CalledOnValidThread());
   simulate_reorder_ = true;
 }
 
 void FakeSignalStrategy::Connect() {
   DCHECK(CalledOnValidThread());
   for (auto& observer : listeners_)
     observer.OnSignalStrategyStateChange(CONNECTED);
 }
 
 void FakeSignalStrategy::Disconnect() {
   DCHECK(CalledOnValidThread());
   for (auto& observer : listeners_)
     observer.OnSignalStrategyStateChange(DISCONNECTED);
 }
 
 SignalStrategy::State FakeSignalStrategy::GetState() const {
   return CONNECTED;
 }
 
 SignalStrategy::Error FakeSignalStrategy::GetError() const {
   return OK;
 }
 
-std::string FakeSignalStrategy::GetLocalJid() const {
+const SignalingAddress& FakeSignalStrategy::GetLocalAddress() const {
   DCHECK(CalledOnValidThread());
-  return jid_;
+  return address_;
 }
 
 void FakeSignalStrategy::AddListener(Listener* listener) {
   DCHECK(CalledOnValidThread());
   listeners_.AddObserver(listener);
 }
 
 void FakeSignalStrategy::RemoveListener(Listener* listener) {
   DCHECK(CalledOnValidThread());
   listeners_.RemoveObserver(listener);
 }
 
 bool FakeSignalStrategy::SendStanza(std::unique_ptr<buzz::XmlElement> stanza) {
   DCHECK(CalledOnValidThread());
 
-  stanza->SetAttr(buzz::QN_FROM, jid_);
+  address_.SetInMessage(stanza.get(), SignalingAddress::FROM);
 
   if (peer_callback_.is_null())
     return false;
 
   if (send_delay_.is_zero()) {
     peer_callback_.Run(std::move(stanza));
   } else {
     base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
         FROM_HERE, base::Bind(peer_callback_, base::Passed(&stanza)),
         send_delay_);
@@ skipping 36 matching lines @@
   }
 }
 
 void FakeSignalStrategy::NotifyListeners(
     std::unique_ptr<buzz::XmlElement> stanza) {
   DCHECK(CalledOnValidThread());
 
   buzz::XmlElement* stanza_ptr = stanza.get();
   received_messages_.push_back(stanza.release());
 
-  const std::string& to_field = stanza_ptr->Attr(buzz::QN_TO);
-  if (NormalizeJid(to_field) != NormalizeJid(jid_)) {
-    LOG(WARNING) << "Dropping stanza that is addressed to " << to_field
-                 << ". Local jid: " << jid_
+  std::string to_error;
+  SignalingAddress to =
+      SignalingAddress::Parse(stanza_ptr, SignalingAddress::TO, &to_error);
+  if (to != address_) {
+    LOG(WARNING) << "Dropping stanza that is addressed to " << to.id()
+                 << ". Local address: " << address_.id()
                  << ". Message content: " << stanza_ptr->Str();
     return;
   }
 
   for (auto& listener : listeners_) {
     if (listener.OnSignalStrategyIncomingStanza(stanza_ptr))
       break;
   }
 }
 
 void FakeSignalStrategy::SetPeerCallback(const PeerCallback& peer_callback) {
   peer_callback_ = peer_callback;
 }
 
 }  // namespace remoting