Add wifi AP info to system profile metrics

net/base/network_change_notifier.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.
 
 #ifndef NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 #define NET_BASE_NETWORK_CHANGE_NOTIFIER_H_
 
 #include "base/basictypes.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/time/time.h"
@@ skipping 29 matching lines @@
     CONNECTION_ETHERNET = 1,
     CONNECTION_WIFI = 2,
     CONNECTION_2G = 3,
     CONNECTION_3G = 4,
     CONNECTION_4G = 5,
     CONNECTION_NONE = 6,     // No connection.
     CONNECTION_BLUETOOTH = 7,
     CONNECTION_LAST = CONNECTION_BLUETOOTH
   };
 
+  // Wifi access point security mode definitions.
+  enum WifiSecurityMode {
+    WIFI_SECURITY_UNKNOWN = 0,
+    WIFI_SECURITY_WPA = 1,
+    WIFI_SECURITY_WEP = 2,
+    WIFI_SECURITY_RSN = 3,
+    WIFI_SECURITY_802_1X = 4,
+    WIFI_SECURITY_PSK = 5,
+    WIFI_SECURITY_NONE
+  };
+
+  // Information of the currently connected wifi access point.
+  struct NET_EXPORT WifiAccessPointInfo {
+    WifiAccessPointInfo();

[stevenjb, 2014/07/15 18:16:14]

nit: struct constructor can be inlined

[zqiu1, 2014/07/15 19:34:02]

There are structs with constructor/destructor that are not inlined (for example
WireAccessPoint in network_util.h).

I will leave it as is for now.

+    ~WifiAccessPointInfo();

[stevenjb, 2014/07/15 18:16:14]

No need for empty destructor in struct

[zqiu1, 2014/07/15 19:34:02]

I think this is still needed, encountered compilation errors on some builds
without the destructor.
../../net/base/network_change_notifier.h:62:3:error: [chromium-style] Complex
class/struct needs an explicit out-of-line destructor.

[stevenjb, 2014/07/15 19:45:08]

Ah, right, I forgot about that. OK.

+    WifiSecurityMode security;
+    std::string bssid;
+    std::string model_number;
+    std::string model_name;
+    std::string device_name;
+    std::string oui_list;
+  };
+
   class NET_EXPORT IPAddressObserver {
    public:
     // Will be called when the IP address of the primary interface changes.
     // This includes when the primary interface itself changes.
     virtual void OnIPAddressChanged() = 0;
 
    protected:
     IPAddressObserver() {}
     virtual ~IPAddressObserver() {}
 
@@ skipping 68 matching lines @@
     DISALLOW_COPY_AND_ASSIGN(NetworkChangeObserver);
   };
 
   virtual ~NetworkChangeNotifier();
 
   // See the description of NetworkChangeNotifier::GetConnectionType().
   // Implementations must be thread-safe. Implementations must also be
   // cheap as this could be called (repeatedly) from the network thread.
   virtual ConnectionType GetCurrentConnectionType() const = 0;
 
+  // Fill in the wifi access point info if device is currently connected to a
+  // wifi access point. Return true if device is connected to a wifi access
+  // point, false otherwise.
+  virtual bool GetCurrentWifiAccessPointInfo(WifiAccessPointInfo* info);
+
   // Replaces the default class factory instance of NetworkChangeNotifier class.
   // The method will take over the ownership of |factory| object.
   static void SetFactory(NetworkChangeNotifierFactory* factory);
 
   // Creates the process-wide, platform-specific NetworkChangeNotifier.  The
   // caller owns the returned pointer.  You may call this on any thread.  You
   // may also avoid creating this entirely (in which case nothing will be
   // monitored), but if you do create it, you must do so before any other
   // threads try to access the API below, and it must outlive all other threads
   // which might try to use it.
   static NetworkChangeNotifier* Create();
 
   // Returns the connection type.
   // A return value of |CONNECTION_NONE| is a pretty strong indicator that the
   // user won't be able to connect to remote sites. However, another return
   // value doesn't imply that the user will be able to connect to remote sites;
   // even if some link is up, it is uncertain whether a particular connection
   // attempt to a particular remote site will be successful.
   // The returned value only describes the connection currently used by the
   // device, and does not take into account other machines on the network. For
   // example, if the device is connected using Wifi to a 3G gateway to access
   // the internet, the connection type is CONNECTION_WIFI.
   static ConnectionType GetConnectionType();
 
+  // Retreive the wifi access point info.
+  static bool GetWifiAccessPointInfo(WifiAccessPointInfo* info);
+
   // Retrieve the last read DnsConfig. This could be expensive if the system has
   // a large HOSTS file.
   static void GetDnsConfig(DnsConfig* config);
 
 #if defined(OS_LINUX)
   // Returns the AddressTrackerLinux if present.
   static const internal::AddressTrackerLinux* GetAddressTracker();
 #endif
 
   // Convenience method to determine if the user is offline.
@@ skipping 167 matching lines @@
 
   // Set true to disable non-test notifications (to prevent flakes in tests).
   bool test_notifications_only_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkChangeNotifier);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CHANGE_NOTIFIER_H_