address comments from https://codereview.webrtc.org/1277263002/

TBR=juberti@webrtc.org,pthather@webrtc.org

Review URL: https://codereview.webrtc.org/1305113002

Cr-Commit-Position: refs/heads/master@{#9757}

7 files changed, 22 insertions, 25 deletions

diff --git a/talk/app/webrtc/fakemetricsobserver.cc b/talk/app/webrtc/fakemetricsobserver.cc
index e833834d48..c27531144e 100644
--- a/talk/app/webrtc/fakemetricsobserver.cc
+++ b/talk/app/webrtc/fakemetricsobserver.cc
@@ -36,7 +36,7 @@ FakeMetricsObserver::FakeMetricsObserver() {
 
 void FakeMetricsObserver::Reset() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  counters_ = std::vector<std::vector<int>>();
+  counters_.clear();
   memset(int_histogram_samples_, 0, sizeof(int_histogram_samples_));
   for (std::string& type : string_histogram_samples_) {
     type.clear();
diff --git a/webrtc/base/network.cc b/webrtc/base/network.cc
index ff9c01afdf..c011c1f1f9 100644
--- a/webrtc/base/network.cc
+++ b/webrtc/base/network.cc
@@ -165,11 +165,11 @@ NetworkManager::~NetworkManager() {
 
 NetworkManager::EnumerationPermission NetworkManager::enumeration_permission()
     const {
-  return kEnumerationAllowed;
+  return ENUMERATION_ALLOWED;
 }
 
 NetworkManagerBase::NetworkManagerBase()
-    : enumeration_permission_(NetworkManager::kEnumerationAllowed),
+    : enumeration_permission_(NetworkManager::ENUMERATION_ALLOWED),
       max_ipv6_networks_(kMaxIPv6Networks),
       ipv6_enabled_(true) {
 }
diff --git a/webrtc/base/network.h b/webrtc/base/network.h
index c4cd565ab4..f365a78772 100644
--- a/webrtc/base/network.h
+++ b/webrtc/base/network.h
@@ -58,12 +58,11 @@ class NetworkManager {
 
   // This enum indicates whether adapter enumeration is allowed.
   enum EnumerationPermission {
-    kEnumerationAllowed,     // Adapter enumeration is allowed. Getting 0
-                             // network from GetNetworks means that there is no
-                             // network available.
-    kEnumerationDisallowed,  // Adapter enumeration is
-                             // disabled. GetAnyAddressNetworks() should be used
-                             // instead.
+    ENUMERATION_ALLOWED,  // Adapter enumeration is allowed. Getting 0 network
+                          // from GetNetworks means that there is no network
+                          // available.
+    ENUMERATION_BLOCKED,  // Adapter enumeration is disabled.
+                          // GetAnyAddressNetworks() should be used instead.
   };
 
   NetworkManager();
diff --git a/webrtc/base/network_unittest.cc b/webrtc/base/network_unittest.cc
index ec1c637bfb..6d920e0a50 100644
--- a/webrtc/base/network_unittest.cc
+++ b/webrtc/base/network_unittest.cc
@@ -183,8 +183,8 @@ TEST_F(NetworkTest, TestUpdateNetworks) {
   BasicNetworkManager manager;
   manager.SignalNetworksChanged.connect(
       static_cast<NetworkTest*>(this), &NetworkTest::OnNetworksChanged);
-  EXPECT_EQ(manager.enumeration_permission(),
-            NetworkManager::kEnumerationAllowed);
+  EXPECT_EQ(NetworkManager::ENUMERATION_ALLOWED,
+            manager.enumeration_permission());
   manager.StartUpdating();
   Thread::Current()->ProcessMessages(0);
   EXPECT_TRUE(callback_called_);
@@ -198,8 +198,8 @@ TEST_F(NetworkTest, TestUpdateNetworks) {
   manager.StopUpdating();
   EXPECT_TRUE(manager.started());
   manager.StopUpdating();
-  EXPECT_EQ(manager.enumeration_permission(),
-            NetworkManager::kEnumerationAllowed);
+  EXPECT_EQ(NetworkManager::ENUMERATION_ALLOWED,
+            manager.enumeration_permission());
   EXPECT_FALSE(manager.started());
   manager.StopUpdating();
   EXPECT_FALSE(manager.started());
diff --git a/webrtc/p2p/base/turnport_unittest.cc b/webrtc/p2p/base/turnport_unittest.cc
index d03bea9565..d0a58ad395 100644
--- a/webrtc/p2p/base/turnport_unittest.cc
+++ b/webrtc/p2p/base/turnport_unittest.cc
@@ -734,8 +734,8 @@ TEST_F(TurnPortTest, TestTurnSendDataTurnUdpToUdp) {
   // Create ports and prepare addresses.
   CreateTurnPort(kTurnUsername, kTurnPassword, kTurnUdpProtoAddr);
   TestTurnSendData();
-  EXPECT_EQ(turn_port_->Candidates()[0].relay_protocol(),
-            cricket::UDP_PROTOCOL_NAME);
+  EXPECT_EQ(cricket::UDP_PROTOCOL_NAME,
+            turn_port_->Candidates()[0].relay_protocol());
 }
 
 // Do a TURN allocation, establish a TCP connection, and send some data.
@@ -744,8 +744,8 @@ TEST_F(TurnPortTest, TestTurnSendDataTurnTcpToUdp) {
   // Create ports and prepare addresses.
   CreateTurnPort(kTurnUsername, kTurnPassword, kTurnTcpProtoAddr);
   TestTurnSendData();
-  EXPECT_EQ(turn_port_->Candidates()[0].relay_protocol(),
-            cricket::TCP_PROTOCOL_NAME);
+  EXPECT_EQ(cricket::TCP_PROTOCOL_NAME,
+            turn_port_->Candidates()[0].relay_protocol());
 }
 
 // Test TURN fails to make a connection from IPv6 address to a server which has
diff --git a/webrtc/p2p/client/basicportallocator.cc b/webrtc/p2p/client/basicportallocator.cc
index e52c5847d4..fe263f597f 100644
--- a/webrtc/p2p/client/basicportallocator.cc
+++ b/webrtc/p2p/client/basicportallocator.cc
@@ -307,7 +307,7 @@ void BasicPortAllocatorSession::DoAllocate() {
   // If the network permission state is BLOCKED, we just act as if the flag has
   // been passed in.
   if (allocator_->network_manager()->enumeration_permission() ==
-      rtc::NetworkManager::kEnumerationDisallowed) {
+      rtc::NetworkManager::ENUMERATION_BLOCKED) {
     set_flags(flags() | PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
   }
 
diff --git a/webrtc/p2p/client/portallocator_unittest.cc b/webrtc/p2p/client/portallocator_unittest.cc
index 986e211448..b6de0c215a 100644
--- a/webrtc/p2p/client/portallocator_unittest.cc
+++ b/webrtc/p2p/client/portallocator_unittest.cc
@@ -1184,19 +1184,17 @@ TEST_F(PortAllocatorTest, TestSharedSocketNoUdpAllowed) {
 TEST_F(PortAllocatorTest, TestNetworkPermissionBlocked) {
   AddInterface(kClientAddr);
   network_manager_.set_enumeration_permission(
-      rtc::NetworkManager::kEnumerationDisallowed);
+      rtc::NetworkManager::ENUMERATION_BLOCKED);
   allocator().set_flags(allocator().flags() |
                         cricket::PORTALLOCATOR_DISABLE_RELAY |
                         cricket::PORTALLOCATOR_DISABLE_TCP |
                         cricket::PORTALLOCATOR_ENABLE_SHARED_UFRAG |
                         cricket::PORTALLOCATOR_ENABLE_SHARED_SOCKET);
-  EXPECT_EQ(
-      allocator_->flags() & cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION,
-      0U);
+  EXPECT_EQ(0U, allocator_->flags() &
+                    cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
   EXPECT_TRUE(CreateSession(cricket::ICE_CANDIDATE_COMPONENT_RTP));
-  EXPECT_EQ(
-      session_->flags() & cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION,
-      0U);
+  EXPECT_EQ(0U, session_->flags() &
+                    cricket::PORTALLOCATOR_DISABLE_ADAPTER_ENUMERATION);
   session_->StartGettingPorts();
   EXPECT_EQ_WAIT(1U, ports_.size(), kDefaultAllocationTimeout);
   EXPECT_EQ(0U, candidates_.size());