WiFi client for GCD bootstrapping

components/wifi/wifi_service_win.cc

Index: components/wifi/wifi_service_win.cc
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index fe9f7d03e73215f993ec44394fa555858da550e9..c1dcfefdf56e03cedfa2ae905dacf264b7206196 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -21,6 +21,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/win/registry.h"
 #include "components/onc/onc_constants.h"
+#include "components/wifi/network_properties.h"
 #include "third_party/libxml/chromium/libxml_utils.h"
 
 namespace {
@@ -581,7 +582,7 @@ void WiFiServiceImpl::CreateNetwork(
   if (CheckError(error_code, kErrorWiFiService, error))
     return;
 
-  WiFiService::NetworkProperties network_properties;
+  NetworkProperties network_properties;
   if (!network_properties.UpdateFromValue(*properties)) {
     CheckError(ERROR_INVALID_DATA, kErrorWiFiService, error);
     return;
@@ -636,7 +637,7 @@ void WiFiServiceImpl::GetVisibleNetworks(const std::string& network_type,
     error = GetVisibleNetworkList(&networks);
     if (error == ERROR_SUCCESS && !networks.empty()) {
       SortNetworks(&networks);
-      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));
@@ -936,7 +937,7 @@ bool WiFiServiceImpl::CheckError(DWORD error_code,
   return false;
 }
 
-WiFiService::NetworkList::iterator WiFiServiceImpl::FindNetwork(
+NetworkList::iterator WiFiServiceImpl::FindNetwork(
     NetworkList& networks,
     const std::string& network_guid) {
   for (NetworkList::iterator it = networks.begin(); it != networks.end();
@@ -1457,7 +1458,7 @@ DWORD WiFiServiceImpl::GetCurrentProperties(NetworkProperties* properties) {
   return error;
 }
 
-WiFiService::Frequency WiFiServiceImpl::GetFrequencyToConnect(
+Frequency WiFiServiceImpl::GetFrequencyToConnect(
     const std::string& network_guid) const {
   // Check whether desired frequency is set in |connect_properties_|.
   const base::DictionaryValue* properties;
@@ -1553,8 +1554,7 @@ DWORD WiFiServiceImpl::GetDesiredBssList(
   return error;
 }
 
-WiFiService::Frequency WiFiServiceImpl::GetNormalizedFrequency(
-    int frequency_in_mhz) const {
+Frequency WiFiServiceImpl::GetNormalizedFrequency(int frequency_in_mhz) const {
   if (frequency_in_mhz == 0)
     return kFrequencyAny;
   if (frequency_in_mhz < 3000)