Index: content/renderer/p2p/ipc_network_manager.cc |
=================================================================== |
--- content/renderer/p2p/ipc_network_manager.cc (revision 287594) |
+++ content/renderer/p2p/ipc_network_manager.cc (working copy) |
@@ -15,21 +15,21 @@ |
namespace { |
-talk_base::AdapterType ConvertConnectionTypeToAdapterType( |
+rtc::AdapterType ConvertConnectionTypeToAdapterType( |
net::NetworkChangeNotifier::ConnectionType type) { |
switch (type) { |
case net::NetworkChangeNotifier::CONNECTION_UNKNOWN: |
- return talk_base::ADAPTER_TYPE_UNKNOWN; |
+ return rtc::ADAPTER_TYPE_UNKNOWN; |
case net::NetworkChangeNotifier::CONNECTION_ETHERNET: |
- return talk_base::ADAPTER_TYPE_ETHERNET; |
+ return rtc::ADAPTER_TYPE_ETHERNET; |
case net::NetworkChangeNotifier::CONNECTION_WIFI: |
- return talk_base::ADAPTER_TYPE_WIFI; |
+ return rtc::ADAPTER_TYPE_WIFI; |
case net::NetworkChangeNotifier::CONNECTION_2G: |
case net::NetworkChangeNotifier::CONNECTION_3G: |
case net::NetworkChangeNotifier::CONNECTION_4G: |
- return talk_base::ADAPTER_TYPE_CELLULAR; |
+ return rtc::ADAPTER_TYPE_CELLULAR; |
default: |
- return talk_base::ADAPTER_TYPE_UNKNOWN; |
+ return rtc::ADAPTER_TYPE_UNKNOWN; |
} |
} |
@@ -73,9 +73,9 @@ |
// Note: 32 and 64 are the arbitrary(kind of) prefix length used to |
// differentiate IPv4 and IPv6 addresses. |
- // talk_base::Network uses these prefix_length to compare network |
+ // rtc::Network uses these prefix_length to compare network |
// interfaces discovered. |
- std::vector<talk_base::Network*> networks; |
+ std::vector<rtc::Network*> networks; |
int ipv4_interfaces = 0; |
int ipv6_interfaces = 0; |
for (net::NetworkInterfaceList::const_iterator it = list.begin(); |
@@ -83,19 +83,19 @@ |
if (it->address.size() == net::kIPv4AddressSize) { |
uint32 address; |
memcpy(&address, &it->address[0], sizeof(uint32)); |
- address = talk_base::NetworkToHost32(address); |
- talk_base::Network* network = new talk_base::Network( |
- it->name, it->name, talk_base::IPAddress(address), 32, |
+ address = rtc::NetworkToHost32(address); |
+ rtc::Network* network = new rtc::Network( |
+ it->name, it->name, rtc::IPAddress(address), 32, |
ConvertConnectionTypeToAdapterType(it->type)); |
- network->AddIP(talk_base::IPAddress(address)); |
+ network->AddIP(rtc::IPAddress(address)); |
networks.push_back(network); |
++ipv4_interfaces; |
} else if (it->address.size() == net::kIPv6AddressSize) { |
in6_addr address; |
memcpy(&address, &it->address[0], sizeof(in6_addr)); |
- talk_base::IPAddress ip6_addr(address); |
- if (!talk_base::IPIsPrivate(ip6_addr)) { |
- talk_base::Network* network = new talk_base::Network( |
+ rtc::IPAddress ip6_addr(address); |
+ if (!rtc::IPIsPrivate(ip6_addr)) { |
+ rtc::Network* network = new rtc::Network( |
it->name, it->name, ip6_addr, 64, |
ConvertConnectionTypeToAdapterType(it->type)); |
network->AddIP(ip6_addr); |
@@ -115,16 +115,16 @@ |
if (CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kAllowLoopbackInPeerConnection)) { |
std::string name_v4("loopback_ipv4"); |
- talk_base::IPAddress ip_address_v4(INADDR_LOOPBACK); |
- talk_base::Network* network_v4 = new talk_base::Network( |
- name_v4, name_v4, ip_address_v4, 32, talk_base::ADAPTER_TYPE_UNKNOWN); |
+ rtc::IPAddress ip_address_v4(INADDR_LOOPBACK); |
+ rtc::Network* network_v4 = new rtc::Network( |
+ name_v4, name_v4, ip_address_v4, 32, rtc::ADAPTER_TYPE_UNKNOWN); |
network_v4->AddIP(ip_address_v4); |
networks.push_back(network_v4); |
std::string name_v6("loopback_ipv6"); |
- talk_base::IPAddress ip_address_v6(in6addr_loopback); |
- talk_base::Network* network_v6 = new talk_base::Network( |
- name_v6, name_v6, ip_address_v6, 64, talk_base::ADAPTER_TYPE_UNKNOWN); |
+ rtc::IPAddress ip_address_v6(in6addr_loopback); |
+ rtc::Network* network_v6 = new rtc::Network( |
+ name_v6, name_v6, ip_address_v6, 64, rtc::ADAPTER_TYPE_UNKNOWN); |
network_v6->AddIP(ip_address_v6); |
networks.push_back(network_v6); |
} |