Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / p2p / base / rawtransport.cc

diff --git a/src/third_party/libjingle/source/talk/p2p/base/rawtransport.cc b/src/third_party/libjingle/source/talk/p2p/base/rawtransport.cc
index fe4f3a2..5913177 100644 (file)
--- a/src/third_party/libjingle/source/talk/p2p/base/rawtransport.cc
+++ b/src/third_party/libjingle/source/talk/p2p/base/rawtransport.cc
@@ -27,21 +27,21 @@
 
 #include <string>
 #include <vector>
-#include "talk/p2p/base/rawtransport.h"
-#include "talk/base/common.h"
 #include "talk/p2p/base/constants.h"
 #include "talk/p2p/base/parsing.h"
-#include "talk/p2p/base/sessionmanager.h"
+#include "talk/p2p/base/rawtransport.h"
 #include "talk/p2p/base/rawtransportchannel.h"
+#include "talk/p2p/base/sessionmanager.h"
 #include "talk/xmllite/qname.h"
 #include "talk/xmllite/xmlelement.h"
 #include "talk/xmpp/constants.h"
+#include "webrtc/base/common.h"
 
 #if defined(FEATURE_ENABLE_PSTN)
 namespace cricket {
 
-RawTransport::RawTransport(talk_base::Thread* signaling_thread,
-                           talk_base::Thread* worker_thread,
+RawTransport::RawTransport(rtc::Thread* signaling_thread,
+                           rtc::Thread* worker_thread,
                            const std::string& content_name,
                            PortAllocator* allocator)
     : Transport(signaling_thread, worker_thread,
@@ -67,7 +67,7 @@ bool RawTransport::ParseCandidates(SignalingProtocol protocol,
       if (type() != cand_elem->Attr(buzz::QN_NAME)) {
         return BadParse("channel named does not exist", error);
       }
-      talk_base::SocketAddress addr;
+      rtc::SocketAddress addr;
       if (!ParseRawAddress(cand_elem, &addr, error))
         return false;
 
@@ -91,7 +91,7 @@ bool RawTransport::WriteCandidates(SignalingProtocol protocol,
        ++cand) {
     ASSERT(cand->component() == 1);
     ASSERT(cand->protocol() == "udp");
-    talk_base::SocketAddress addr = cand->address();
+    rtc::SocketAddress addr = cand->address();
 
     buzz::XmlElement* elem = new buzz::XmlElement(QN_GINGLE_RAW_CHANNEL);
     elem->SetAttr(buzz::QN_NAME, type());
@@ -103,7 +103,7 @@ bool RawTransport::WriteCandidates(SignalingProtocol protocol,
 }
 
 bool RawTransport::ParseRawAddress(const buzz::XmlElement* elem,
-                                   talk_base::SocketAddress* addr,
+                                   rtc::SocketAddress* addr,
                                    ParseError* error) {
   // Make sure the required attributes exist
   if (!elem->HasAttr(QN_ADDRESS) ||