WiFi client for GCD bootstrapping

components/wifi/wifi_service_mac.mm

Index: components/wifi/wifi_service_mac.mm
diff --git a/components/wifi/wifi_service_mac.mm b/components/wifi/wifi_service_mac.mm
index 686059654111909fdfdcb7a43b7da01e88212a02..286525abd453f39c4c22684d64c9d8706c675317 100644
--- a/components/wifi/wifi_service_mac.mm
+++ b/components/wifi/wifi_service_mac.mm
@@ -15,6 +15,7 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/onc/onc_constants.h"
+#include "components/wifi/network_properties.h"
 
 #if !defined(MAC_OS_X_VERSION_10_7) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
@@ -126,7 +127,7 @@ class WiFiServiceMac : public WiFiService {
   // Converts |CWSecurityMode| into onc::wifi::k{WPA|WEP}* security constant.
   std::string SecurityFromCWSecurityMode(CWSecurityMode security) const;
 
-  // Converts |CWChannelBand| into WiFiService::Frequency constant.
+  // Converts |CWChannelBand| into Frequency constant.
   Frequency FrequencyFromCWChannelBand(CWChannelBand band) const;
 
   // Gets current |onc::connection_state| for given |network_guid|.
@@ -252,7 +253,7 @@ void WiFiServiceMac::CreateNetwork(
     scoped_ptr<base::DictionaryValue> properties,
     std::string* network_guid,
     std::string* error) {
-  WiFiService::NetworkProperties network_properties;
+  NetworkProperties network_properties;
   if (!network_properties.UpdateFromValue(*properties)) {
     *error = kErrorInvalidData;
     return;
@@ -279,7 +280,7 @@ void WiFiServiceMac::GetVisibleNetworks(const std::string& network_type,
   if (networks_.empty())
     UpdateNetworks();
 
-  for (WiFiService::NetworkList::const_iterator it = networks_.begin();
+  for (NetworkList::const_iterator it = networks_.begin();
        it != networks_.end();
        ++it) {
     scoped_ptr<base::DictionaryValue> network(it->ToValue(true));
@@ -557,13 +558,11 @@ std::string WiFiServiceMac::SecurityFromCWSecurityMode(
   return onc::wifi::kWPA_EAP;
 }
 
-
-WiFiService::Frequency WiFiServiceMac::FrequencyFromCWChannelBand(
-    CWChannelBand band) const {
+Frequency WiFiServiceMac::FrequencyFromCWChannelBand(CWChannelBand band) const {
   return band == kCWChannelBand2GHz ? kFrequency2400 : kFrequency5000;
 }
 
-WiFiService::NetworkList::iterator WiFiServiceMac::FindNetwork(
+NetworkList::iterator WiFiServiceMac::FindNetwork(
     const std::string& network_guid) {
   for (NetworkList::iterator it = networks_.begin();
        it != networks_.end();