Use network counting from webrtc for UMA.

content/renderer/p2p/ipc_network_manager.cc

Index: content/renderer/p2p/ipc_network_manager.cc
diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc
index f1db22b5f8443fed2bd19fe23847f4fcca123c82..44f3585dc9e37515f028eb7b4fdaa46a419e4323 100644
--- a/content/renderer/p2p/ipc_network_manager.cc
+++ b/content/renderer/p2p/ipc_network_manager.cc
@@ -74,8 +74,6 @@ void IpcNetworkManager::OnNetworkListChanged(
   // rtc::Network uses these prefix_length to compare network
   // interfaces discovered.
   std::vector<rtc::Network*> networks;
-  int ipv4_interfaces = 0;
-  int ipv6_interfaces = 0;
   for (net::NetworkInterfaceList::const_iterator it = list.begin();
        it != list.end(); it++) {
     if (it->address.size() == net::kIPv4AddressSize) {
@@ -89,7 +87,6 @@ void IpcNetworkManager::OnNetworkListChanged(
                            ConvertConnectionTypeToAdapterType(it->type));
       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));
@@ -102,18 +99,10 @@ void IpcNetworkManager::OnNetworkListChanged(
                              ConvertConnectionTypeToAdapterType(it->type));
         network->AddIP(ip6_addr);
         networks.push_back(network);
-        ++ipv6_interfaces;
       }
     }
   }
 
-
-  // Send interface counts to UMA.
-  UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv4Interfaces",
-                           ipv4_interfaces);
-  UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv6Interfaces",
-                           ipv6_interfaces);
-
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAllowLoopbackInPeerConnection)) {
     std::string name_v4("loopback_ipv4");
@@ -132,9 +121,17 @@ void IpcNetworkManager::OnNetworkListChanged(
   }
 
   bool changed = false;
-  MergeNetworkList(networks, &changed);
-  if (changed)
+  NetworkManager::Stats stats;
+  MergeNetworkList(networks, &changed, &stats);
+  if (changed) {

[Sergey Ulanov, 2015/02/09 19:23:59]

remove {} here or add them in lines 71-72, to make single-line ifs consistent in
this file.

     SignalNetworksChanged();
+  }
+
+  // Send interface counts to UMA.
+  UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv4Interfaces",
+                           stats.ipv4_network_count);
+  UMA_HISTOGRAM_COUNTS_100("WebRTC.PeerConnection.IPv6Interfaces",
+                           stats.ipv6_network_count);
 }
 
 void IpcNetworkManager::SendNetworksChangedSignal() {