[net] Add WifiPhyMode to SystemProfile

chrome/browser/metrics/metrics_log.h

 // 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.
 
 // This file defines a set of user experience metrics data recorded by
 // the MetricsService.  This is the unit of data that is sent to the server.
 
 #ifndef CHROME_BROWSER_METRICS_METRICS_LOG_H_
 #define CHROME_BROWSER_METRICS_METRICS_LOG_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "chrome/browser/metrics/metrics_network_observer.h"
 #include "chrome/common/metrics/metrics_log_base.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/common/process_type.h"
 #include "ui/gfx/size.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/metrics/perf_provider_chromeos.h"
 #endif
 
 struct AutocompleteLog;
+class MetricsNetworkObserver;
 class PrefService;
 class PrefRegistrySimple;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace tracked_objects {
 struct ProcessDataSnapshot;
 }
@@ skipping 103 matching lines @@
   virtual int GetScreenCount() const;
 
   // Fills |field_trial_ids| with the list of initialized field trials name and
   // group ids.
   virtual void GetFieldTrialIds(
     std::vector<chrome_variations::ActiveGroupId>* field_trial_ids) const;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MetricsLogTest, ChromeOSStabilityData);
 
-  class NetworkObserver;
-
   // Writes application stability metrics (as part of the profile log).
   // NOTE: Has the side-effect of clearing those counts.
   void WriteStabilityElement(
       const std::vector<webkit::WebPluginInfo>& plugin_list,
       PrefService* pref);
 
   // Within stability group, write plugin crash stats.
   void WritePluginStabilityElements(
       const std::vector<webkit::WebPluginInfo>& plugin_list,
       PrefService* pref);
@@ skipping 23 matching lines @@
 
   // Writes metrics for the profile identified by key. This writes all
   // key/value pairs in profile_metrics.
   void WriteProfileMetrics(const std::string& key,
                            const base::DictionaryValue& profile_metrics);
 
   // Writes info about the Google Update install that is managing this client.
   // This is a no-op if called on a non-Windows platform.
   void WriteGoogleUpdateProto(const GoogleUpdateMetrics& google_update_metrics);
 
-  // Registers as observer with net::NetworkChangeNotifier and keeps track of
-  // the network environment.
-  scoped_ptr<NetworkObserver> network_observer_;
+  // Observes network state to provide values for SystemProfile::Network.
+  MetricsNetworkObserver network_observer_;
+
 #if defined(OS_CHROMEOS)
   metrics::PerfProvider perf_provider_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(MetricsLog);
 };
 
 #endif  // CHROME_BROWSER_METRICS_METRICS_LOG_H_