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

Unified Diff: webrtc/base/network.cc

Issue 1288843003: Revert "Generate localhost candidate when no STUN/TURN and portallocator has the right flag spefied… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 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 | « webrtc/base/network.h ('k') | webrtc/base/network_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/network.cc
diff --git a/webrtc/base/network.cc b/webrtc/base/network.cc
index 8dda89f42c08dc190ddc5b2f21d3cf16d9fabd3d..2081c94e2c767f626b77920e8b2dd8799d6a1c98 100644
--- a/webrtc/base/network.cc
+++ b/webrtc/base/network.cc
@@ -164,9 +164,7 @@ NetworkManager::~NetworkManager() {
}
NetworkManagerBase::NetworkManagerBase()
- : enumeration_permission_(NetworkManager::kEnumerationAllowed),
- max_ipv6_networks_(kMaxIPv6Networks),
- ipv6_enabled_(true) {
+ : max_ipv6_networks_(kMaxIPv6Networks), ipv6_enabled_(true) {
}
NetworkManagerBase::~NetworkManagerBase() {
@@ -175,11 +173,6 @@ NetworkManagerBase::~NetworkManagerBase() {
}
}
-NetworkManager::EnumerationPermission
-NetworkManagerBase::enumeration_permission() const {
- return enumeration_permission_;
-}
-
void NetworkManagerBase::GetAnyAddressNetworks(NetworkList* networks) {
if (!ipv4_any_address_network_) {
const rtc::IPAddress ipv4_any_address(INADDR_ANY);
« no previous file with comments | « webrtc/base/network.h ('k') | webrtc/base/network_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698