diff options
| author | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:19:46 +0000 |
|---|---|---|
| committer | ronghuawu@chromium.org <ronghuawu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-31 22:19:46 +0000 |
| commit | bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a (patch) | |
| tree | c8f5b0600665f3597d8c036411f565b6ba79515e /jingle/glue/utils.cc | |
| parent | 00e1d2773de880b96aff7e2d33b2b0914778901f (diff) | |
| download | chromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.zip chromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.tar.gz chromium_src-bf45dff0ca703e5ad3bb6c6754ebdcb0c1b1296a.tar.bz2 | |
Update webrtc&libjingle 6774:6799.
BUG=N/A
R=hellner@chromium.org
TBR=darin@chromium.org, hclam@chromium.org, jochen@chromium.org, palmer@chromium.org, sergeyu@chromium.org, wez@chromium.org
Commit on behalf of hellner@. Original CL tried and approved in https://codereview.chromium.org/429113002/
Review URL: https://codereview.chromium.org/429253003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@286902 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle/glue/utils.cc')
| -rw-r--r-- | jingle/glue/utils.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc index 5350631..acf45cb 100644 --- a/jingle/glue/utils.cc +++ b/jingle/glue/utils.cc @@ -11,21 +11,21 @@ #include "base/values.h" #include "net/base/ip_endpoint.h" #include "net/base/net_util.h" -#include "third_party/libjingle/source/talk/base/byteorder.h" -#include "third_party/libjingle/source/talk/base/socketaddress.h" #include "third_party/libjingle/source/talk/p2p/base/candidate.h" +#include "third_party/webrtc/base/byteorder.h" +#include "third_party/webrtc/base/socketaddress.h" namespace jingle_glue { bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint, - talk_base::SocketAddress* address) { + rtc::SocketAddress* address) { sockaddr_storage addr; socklen_t len = sizeof(addr); return ip_endpoint.ToSockAddr(reinterpret_cast<sockaddr*>(&addr), &len) && - talk_base::SocketAddressFromSockAddrStorage(addr, address); + rtc::SocketAddressFromSockAddrStorage(addr, address); } -bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address, +bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address, net::IPEndPoint* ip_endpoint) { sockaddr_storage addr; int size = address.ToSockAddrStorage(&addr); @@ -81,7 +81,7 @@ bool DeserializeP2PCandidate(const std::string& candidate_str, return false; } - candidate->set_address(talk_base::SocketAddress(ip, port)); + candidate->set_address(rtc::SocketAddress(ip, port)); candidate->set_type(type); candidate->set_protocol(protocol); candidate->set_username(username); |