Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(214)

Unified Diff: remoting/client/plugin/pepper_util.cc

Issue 429113002: Webrtc deps roll. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use webrtc version 6825 and rebase and switch back to original workspace. Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/client/plugin/pepper_util.h ('k') | remoting/host/chromium_port_allocator_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/client/plugin/pepper_util.cc
diff --git a/remoting/client/plugin/pepper_util.cc b/remoting/client/plugin/pepper_util.cc
index d00189c70abc45ee8dacadfc99e40d2ef73f95b7..0e575c8c6961a19d3f6a6c7c779cd14562e9bbd7 100644
--- a/remoting/client/plugin/pepper_util.cc
+++ b/remoting/client/plugin/pepper_util.cc
@@ -9,13 +9,13 @@
#include "base/sys_byteorder.h"
#include "ppapi/cpp/module.h"
#include "ppapi/cpp/net_address.h"
-#include "third_party/libjingle/source/talk/base/socketaddress.h"
+#include "third_party/webrtc/base/socketaddress.h"
namespace remoting {
bool SocketAddressToPpNetAddressWithPort(
const pp::InstanceHandle& instance,
- const talk_base::SocketAddress& address,
+ const rtc::SocketAddress& address,
pp::NetAddress* pp_address,
uint16_t port) {
switch (address.ipaddr().family()) {
@@ -43,7 +43,7 @@ bool SocketAddressToPpNetAddressWithPort(
}
bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance,
- const talk_base::SocketAddress& address,
+ const rtc::SocketAddress& address,
pp::NetAddress* pp_net_address) {
return SocketAddressToPpNetAddressWithPort(instance,
address,
@@ -52,12 +52,12 @@ bool SocketAddressToPpNetAddress(const pp::InstanceHandle& instance,
}
void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address,
- talk_base::SocketAddress* address) {
+ rtc::SocketAddress* address) {
switch (pp_net_address.GetFamily()) {
case PP_NETADDRESS_FAMILY_IPV4: {
PP_NetAddress_IPv4 ipv4_addr;
CHECK(pp_net_address.DescribeAsIPv4Address(&ipv4_addr));
- address->SetIP(talk_base::IPAddress(
+ address->SetIP(rtc::IPAddress(
bit_cast<in_addr>(ipv4_addr.addr)));
address->SetPort(base::NetToHost16(ipv4_addr.port));
return;
@@ -65,7 +65,7 @@ void PpNetAddressToSocketAddress(const pp::NetAddress& pp_net_address,
case PP_NETADDRESS_FAMILY_IPV6: {
PP_NetAddress_IPv6 ipv6_addr;
CHECK(pp_net_address.DescribeAsIPv6Address(&ipv6_addr));
- address->SetIP(talk_base::IPAddress(
+ address->SetIP(rtc::IPAddress(
bit_cast<in6_addr>(ipv6_addr.addr)));
address->SetPort(base::NetToHost16(ipv6_addr.port));
return;
« no previous file with comments | « remoting/client/plugin/pepper_util.h ('k') | remoting/host/chromium_port_allocator_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698