X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fthird_party%2Flibjingle%2Fsource%2Ftalk%2Fp2p%2Fbase%2Fportallocatorsessionproxy.cc;h=a6c80658f2232fc8baf3880195bda59cbc0c2fbf;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=d804bdc68481a9ef16207e947dd6290dc20012cd;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git diff --git a/src/third_party/libjingle/source/talk/p2p/base/portallocatorsessionproxy.cc b/src/third_party/libjingle/source/talk/p2p/base/portallocatorsessionproxy.cc index d804bdc..a6c8065 100644 --- a/src/third_party/libjingle/source/talk/p2p/base/portallocatorsessionproxy.cc +++ b/src/third_party/libjingle/source/talk/p2p/base/portallocatorsessionproxy.cc @@ -27,9 +27,9 @@ #include "talk/p2p/base/portallocatorsessionproxy.h" -#include "talk/base/thread.h" #include "talk/p2p/base/portallocator.h" #include "talk/p2p/base/portproxy.h" +#include "webrtc/base/thread.h" namespace cricket { @@ -38,11 +38,11 @@ enum { MSG_SEND_ALLOCATED_PORTS, }; -typedef talk_base::TypedMessageData ProxyObjData; +typedef rtc::TypedMessageData ProxyObjData; PortAllocatorSessionMuxer::PortAllocatorSessionMuxer( PortAllocatorSession* session) - : worker_thread_(talk_base::Thread::Current()), + : worker_thread_(rtc::Thread::Current()), session_(session), candidate_done_signal_received_(false) { session_->SignalPortReady.connect( @@ -114,7 +114,7 @@ void PortAllocatorSessionMuxer::OnSessionProxyDestroyed( } } -void PortAllocatorSessionMuxer::OnMessage(talk_base::Message *pmsg) { +void PortAllocatorSessionMuxer::OnMessage(rtc::Message *pmsg) { ProxyObjData* proxy = static_cast(pmsg->pdata); switch (pmsg->message_id) { case MSG_SEND_ALLOCATION_DONE: