Remove MetricsServiceObserver in favor of MetricsProvider.

chrome/browser/metrics/network_metrics_provider.cc

 // Copyright 2014 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 "chrome/browser/metrics/network_metrics_provider.h"
 
+#include <string>
+#include <vector>
+
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/metrics/wifi_access_point_info_provider_chromeos.h"
 #endif // OS_CHROMEOS
 
 using metrics::SystemProfileProto;
 
 NetworkMetricsProvider::NetworkMetricsProvider()
     : connection_type_is_ambiguous_(false),
       wifi_phy_layer_protocol_is_ambiguous_(false),
       wifi_phy_layer_protocol_(net::WIFI_PHY_LAYER_PROTOCOL_UNKNOWN),
       weak_ptr_factory_(this) {
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
   connection_type_ = net::NetworkChangeNotifier::GetConnectionType();
   ProbeWifiPHYLayerProtocol();
 }
 
 NetworkMetricsProvider::~NetworkMetricsProvider() {
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
 }
 
+void NetworkMetricsProvider::OnDidCreateMetricsLog() {
+  net::NetworkChangeNotifier::LogOperatorCodeHistogram(
+      net::NetworkChangeNotifier::GetConnectionType());
+}
+
 void NetworkMetricsProvider::ProvideSystemProfileMetrics(
     SystemProfileProto* system_profile) {
   SystemProfileProto::Network* network = system_profile->mutable_network();
   network->set_connection_type_is_ambiguous(connection_type_is_ambiguous_);
   network->set_connection_type(GetConnectionType());
   network->set_wifi_phy_layer_protocol_is_ambiguous(
       wifi_phy_layer_protocol_is_ambiguous_);
   network->set_wifi_phy_layer_protocol(GetWifiPHYLayerProtocol());
 
   // Resets the "ambiguous" flags, since a new metrics log session has started.
@@ skipping 166 matching lines @@
   for (std::vector<std::string>::const_iterator it = oui_list.begin();
        it != oui_list.end();
        ++it) {
     uint32 oui;
     if (base::HexStringToUInt(*it, &oui))
       vendor->add_element_identifier(oui);
     else
       NOTREACHED();
   }
 }