Log operator code histogram on new metric log

net/base/network_change_notifier.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/base/network_change_notifier.h"
 
 #include "base/metrics/histogram.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "build/build_config.h"
@@ skipping 217 matching lines @@
               offline_packets_received_);
         }
 
         UMA_HISTOGRAM_MEDIUM_TIMES("NCN.OfflineDataRecvUntilOnline",
                                    now - last_offline_packet_received_);
       }
     } else {
       UMA_HISTOGRAM_MEDIUM_TIMES("NCN.OfflineChange", state_duration);
     }
 
-#if defined(OS_ANDROID)
-    // On a connection type change to 2/3/4G, log the network operator MCC/MNC.
-    // Log zero in other cases.
-    unsigned mcc_mnc = 0;
-    if (type == NetworkChangeNotifier::CONNECTION_2G ||
-        type == NetworkChangeNotifier::CONNECTION_3G ||
-        type == NetworkChangeNotifier::CONNECTION_4G) {
-      // Log zero if not perfectly converted.
-      if (!base::StringToUint(
-          net::android::GetTelephonyNetworkOperator(), &mcc_mnc)) {
-        mcc_mnc = 0;
-      }
-    }
-    UMA_HISTOGRAM_SPARSE_SLOWLY(
-        "NCN.NetworkOperatorMCCMNC_ConnectionChange", mcc_mnc);
-#endif
+    NetworkChangeNotifier::LogOperatorCodeHistogram(type);
 
     UMA_HISTOGRAM_MEDIUM_TIMES(
         "NCN.IPAddressChangeToConnectionTypeChange",
         now - last_ip_address_change_);
 
     offline_packets_received_ = 0;
     bytes_read_since_last_connection_change_ = 0;
     peak_kbps_since_last_connection_change_ = 0;
     last_connection_type_ = type;
     polling_interval_ = base::TimeDelta::FromSeconds(1);
@@ skipping 323 matching lines @@
   g_network_change_notifier->histogram_watcher_->Init();
 }
 
 // static
 void NetworkChangeNotifier::ShutdownHistogramWatcher() {
   if (!g_network_change_notifier)
     return;
   g_network_change_notifier->histogram_watcher_.reset();
 }
 
+// static
+void NetworkChangeNotifier::LogOperatorCodeHistogram(ConnectionType type) {
+#if defined(OS_ANDROID)
+  // On a connection type change to 2/3/4G, log the network operator MCC/MNC.
+  // Log zero in other cases.
+  unsigned mcc_mnc = 0;
+  if (type == NetworkChangeNotifier::CONNECTION_2G ||
+      type == NetworkChangeNotifier::CONNECTION_3G ||
+      type == NetworkChangeNotifier::CONNECTION_4G) {
+    // Log zero if not perfectly converted.
+    if (!base::StringToUint(
+        net::android::GetTelephonyNetworkOperator(), &mcc_mnc)) {
+      mcc_mnc = 0;
+    }
+  }
+  UMA_HISTOGRAM_SPARSE_SLOWLY("NCN.NetworkOperatorMCCMNC", mcc_mnc);
+#endif
+}
+
 #if defined(OS_LINUX)
 // static
 const internal::AddressTrackerLinux*
 NetworkChangeNotifier::GetAddressTracker() {
   return g_network_change_notifier ?
         g_network_change_notifier->GetAddressTrackerInternal() : NULL;
 }
 #endif
 
 // static
@@ skipping 159 matching lines @@
   DCHECK(g_network_change_notifier);
   g_network_change_notifier = NULL;
 }
 
 NetworkChangeNotifier::DisableForTest::~DisableForTest() {
   DCHECK(!g_network_change_notifier);
   g_network_change_notifier = network_change_notifier_;
 }
 
 }  // namespace net