[net] Add WifiPhyMode to SystemProfile

chrome/browser/metrics/metrics_log.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 "chrome/browser/metrics/metrics_log.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 12 matching lines @@
 #include "base/time.h"
 #include "base/tracked_objects.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_log.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/autocomplete/autocomplete_result.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
+#include "chrome/browser/metrics/metrics_network_observer.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/gpu_info.h"
 #include "googleurl/src/gurl.h"
-#include "net/base/network_change_notifier.h"
 #include "ui/gfx/screen.h"
 #include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_ANDROID)
 #include "base/android/build_info.h"
 #endif
 
 #define OPEN_ELEMENT_FOR_SCOPE(name) ScopedElement scoped_element(this, name)
 
 #if defined(OS_WIN)
@@ skipping 242 matching lines @@
       hardware->set_max_dpi_y(si.max_dpi_y);
     }
     ReleaseDC(GetDesktopWindow(), desktop_dc);
   }
 }
 
 #endif  // defined(OS_WIN)
 
 }  // namespace
 
-class MetricsLog::NetworkObserver
-    : public net::NetworkChangeNotifier::ConnectionTypeObserver {
- public:
-  NetworkObserver() : connection_type_is_ambiguous_(false) {
-    net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
-    Reset();
-  }
-  virtual ~NetworkObserver() {
-    net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
-  }
-
-  void Reset() {
-    connection_type_is_ambiguous_ = false;
-    connection_type_ = net::NetworkChangeNotifier::GetConnectionType();
-  }
-
-  // ConnectionTypeObserver:
-  virtual void OnConnectionTypeChanged(
-      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE {
-    if (type == net::NetworkChangeNotifier::CONNECTION_NONE)
-      return;
-    if (type != connection_type_ &&
-        connection_type_ != net::NetworkChangeNotifier::CONNECTION_NONE) {
-      connection_type_is_ambiguous_ = true;
-    }
-    connection_type_ = type;
-  }
-
-  bool connection_type_is_ambiguous() const {
-    return connection_type_is_ambiguous_;
-  }
-
-  SystemProfileProto::Network::ConnectionType connection_type() const {
-    switch (connection_type_) {
-      case net::NetworkChangeNotifier::CONNECTION_NONE:
-      case net::NetworkChangeNotifier::CONNECTION_UNKNOWN:
-        return SystemProfileProto::Network::CONNECTION_UNKNOWN;
-      case net::NetworkChangeNotifier::CONNECTION_ETHERNET:
-        return SystemProfileProto::Network::CONNECTION_ETHERNET;
-      case net::NetworkChangeNotifier::CONNECTION_WIFI:
-        return SystemProfileProto::Network::CONNECTION_WIFI;
-      case net::NetworkChangeNotifier::CONNECTION_2G:
-        return SystemProfileProto::Network::CONNECTION_2G;
-      case net::NetworkChangeNotifier::CONNECTION_3G:
-        return SystemProfileProto::Network::CONNECTION_3G;
-      case net::NetworkChangeNotifier::CONNECTION_4G:
-        return SystemProfileProto::Network::CONNECTION_4G;
-    }
-    NOTREACHED();
-    return SystemProfileProto::Network::CONNECTION_UNKNOWN;
-  }
-
- private:
-  bool connection_type_is_ambiguous_;
-  net::NetworkChangeNotifier::ConnectionType connection_type_;
-
-  DISALLOW_COPY_AND_ASSIGN(NetworkObserver);
-};
-
 GoogleUpdateMetrics::GoogleUpdateMetrics() : is_system_install(false) {}
 
 GoogleUpdateMetrics::~GoogleUpdateMetrics() {}
 
 static base::LazyInstance<std::string>::Leaky
   g_version_extension = LAZY_INSTANCE_INITIALIZER;
 
 MetricsLog::MetricsLog(const std::string& client_id, int session_id)
     : MetricsLogBase(client_id, session_id, MetricsLog::GetVersionString()),
-      network_observer_(new NetworkObserver()) {}
+      network_observer_(new MetricsNetworkObserver()) {}
 
 MetricsLog::~MetricsLog() {}
 
 // static
 void MetricsLog::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterListPref(prefs::kStabilityPluginStats);
 }
 
 // static
 int64 MetricsLog::GetIncrementalUptime(PrefService* pref) {
@@ skipping 481 matching lines @@
   hardware->set_cpu_architecture(base::SysInfo::OperatingSystemArchitecture());
   hardware->set_system_ram_mb(base::SysInfo::AmountOfPhysicalMemoryMB());
 #if defined(OS_WIN)
   hardware->set_dll_base(reinterpret_cast<uint64>(&__ImageBase));
 #endif
 
   SystemProfileProto::Network* network = system_profile->mutable_network();
   network->set_connection_type_is_ambiguous(
       network_observer_->connection_type_is_ambiguous());
   network->set_connection_type(network_observer_->connection_type());
+  network->set_wifi_phy_mode_is_ambiguous(
+      network_observer_->wifi_phy_mode_is_ambiguous());
+  network->set_wifi_phy_mode(network_observer_->wifi_phy_mode());
   network_observer_->Reset();
 
   SystemProfileProto::OS* os = system_profile->mutable_os();
   std::string os_name = base::SysInfo::OperatingSystemName();
 #if defined(OS_WIN)
   // TODO(mad): This only checks whether the main process is a Metro process at
   // upload time; not whether the collected metrics were all gathered from
   // Metro.  This is ok as an approximation for now, since users will rarely be
   // switching from Metro to Desktop mode; but we should re-evaluate whether we
   // can distinguish metrics more cleanly in the future: http://crbug.com/140568
@@ skipping 253 matching lines @@
     ProductDataToProto(google_update_metrics.google_update_data,
                        google_update->mutable_google_update_status());
   }
 
   if (!google_update_metrics.product_data.version.empty()) {
     ProductDataToProto(google_update_metrics.product_data,
                        google_update->mutable_client_status());
   }
 #endif  // defined(GOOGLE_CHROME_BUILD) && defined(OS_WIN)
 }