Move SignalingAddress to remoting/signaling

remoting/protocol/jingle_messages.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
 #define REMOTING_PROTOCOL_JINGLE_MESSAGES_H_
 
 #include <list>
 #include <memory>
 #include <string>
 
 #include "remoting/protocol/errors.h"
+#include "remoting/signaling/signaling_address.h"
 #include "third_party/libjingle_xmpp/xmllite/xmlelement.h"
 #include "third_party/webrtc/p2p/base/candidate.h"
 
 namespace remoting {
 namespace protocol {
 
 class ContentDescription;
 
-// Represents an address of a Chromoting endpoint and its routing channel.
-// TODO(kelvinp): Move the struct to remoting/signaling. Potentially we could
-// update SignalStrategy interface to use this instead of jid for addressing.
-class SignalingAddress {
- public:
-  enum class Channel { LCS, XMPP };
-
-  SignalingAddress();
-  SignalingAddress(const std::string& jid);
-  SignalingAddress(const std::string& jid,
-                   const std::string& endpoint_id,
-                   Channel channel);
-
-  const std::string& jid() const { return jid_; }
-  const std::string& endpoint_id() const { return endpoint_id_; }
-  Channel channel() const { return channel_; }
-  const std::string& id() const {
-    return (channel_ == Channel::LCS) ? endpoint_id_ : jid_;
-  }
-
-  bool empty() const { return jid_.empty(); }
-
-  bool operator==(const SignalingAddress& other) const;
-  bool operator!=(const SignalingAddress& other) const;
-
- private:
-  // Represents the |to| or |from| field in an IQ stanza.
-  std::string jid_;
-
-  // Represents the identifier of an endpoint. In  LCS, this is the LCS address
-  // encoded in a JID like format.  In XMPP, it is empty.
-  std::string endpoint_id_;
-
-  Channel channel_;
-};
-
 struct JingleMessage {
   enum ActionType {
     UNKNOWN_ACTION,
     SESSION_INITIATE,
     SESSION_ACCEPT,
     SESSION_TERMINATE,
     SESSION_INFO,
     TRANSPORT_INFO,
   };
 
@@ skipping 118 matching lines @@
   std::unique_ptr<buzz::XmlElement> ToXml() const;
 
   std::list<IceCredentials> ice_credentials;
   std::list<NamedCandidate> candidates;
 };
 
 }  // protocol
 }  // remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_MESSAGES_H_