WiFi client for GCD bootstrapping

components/wifi/network_properties.cc

Index: components/wifi/network_properties.cc
diff --git a/components/wifi/wifi_service.cc b/components/wifi/network_properties.cc
similarity index 73%
copy from components/wifi/wifi_service.cc
copy to components/wifi/network_properties.cc
index ef6b3a0a8d9c6fe33964baeed28d5b6dac6c68b8..3ab12daf1d376d72cc4fc8e404a8f9284115e74d 100644
--- a/components/wifi/wifi_service.cc
+++ b/components/wifi/network_properties.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 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 "components/wifi/wifi_service.h"
+#include "components/wifi/network_properties.h"
 
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ -11,26 +11,18 @@
 
 namespace wifi {
 
-const char WiFiService::kErrorAssociateToNetwork[] = "Error.AssociateToNetwork";
-const char WiFiService::kErrorInvalidData[] = "Error.InvalidData";
-const char WiFiService::kErrorNotConfigured[] ="Error.NotConfigured";
-const char WiFiService::kErrorNotConnected[] = "Error.NotConnected";
-const char WiFiService::kErrorNotFound[] = "Error.NotFound";
-const char WiFiService::kErrorNotImplemented[] = "Error.NotImplemented";
-const char WiFiService::kErrorScanForNetworksWithName[] =
-    "Error.ScanForNetworksWithName";
-const char WiFiService::kErrorWiFiService[] = "Error.WiFiService";
-
-WiFiService::NetworkProperties::NetworkProperties()
+NetworkProperties::NetworkProperties()
     : connection_state(onc::connection_state::kNotConnected),
       security(onc::wifi::kNone),
       signal_strength(0),
       auto_connect(false),
-      frequency(WiFiService::kFrequencyUnknown) {}
+      frequency(kFrequencyUnknown) {
+}
 
-WiFiService::NetworkProperties::~NetworkProperties() {}
+NetworkProperties::~NetworkProperties() {
+}
 
-scoped_ptr<base::DictionaryValue> WiFiService::NetworkProperties::ToValue(
+scoped_ptr<base::DictionaryValue> NetworkProperties::ToValue(
     bool network_list) const {

[mef, 2014/06/04 14:17:47]

I guess we should change |network_list| flag to match |include_details| as it is
more meaningful.

[Noam Samuel, 2014/06/04 17:11:27]

Thought of doing this, was afraid I'd introduce bugs by not flipping every call.
Makes sense IMO to do in a different CL. Or maybe it could be renamed to
|hide_details| to make things easier.

   scoped_ptr<base::DictionaryValue> value(new base::DictionaryValue());
 
@@ -49,7 +41,7 @@ scoped_ptr<base::DictionaryValue> WiFiService::NetworkProperties::ToValue(
 
   // Network list expects subset of data.
   if (!network_list) {
-    if (frequency != WiFiService::kFrequencyUnknown)
+    if (frequency != kFrequencyUnknown)
       wifi->SetInteger(onc::wifi::kFrequency, frequency);
     scoped_ptr<base::ListValue> frequency_list(new base::ListValue());
     for (FrequencySet::const_iterator it = this->frequency_set.begin();
@@ -76,8 +68,7 @@ scoped_ptr<base::DictionaryValue> WiFiService::NetworkProperties::ToValue(
   return value.Pass();
 }
 
-bool WiFiService::NetworkProperties::UpdateFromValue(
-    const base::DictionaryValue& value) {
+bool NetworkProperties::UpdateFromValue(const base::DictionaryValue& value) {
   const base::DictionaryValue* wifi = NULL;
   std::string network_type;
   // Get network type and make sure that it is WiFi (if specified).
@@ -87,6 +78,9 @@ bool WiFiService::NetworkProperties::UpdateFromValue(
     type = network_type;
   }
   if (value.GetDictionary(onc::network_type::kWiFi, &wifi)) {
+    value.GetString(onc::network_config::kName, &name);
+    value.GetString(onc::network_config::kGUID, &guid);
+    value.GetString(onc::network_config::kConnectionState, &connection_state);
     wifi->GetString(onc::wifi::kSecurity, &security);
     wifi->GetString(onc::wifi::kSSID, &ssid);
     wifi->GetString(onc::wifi::kPassphrase, &password);
@@ -96,8 +90,7 @@ bool WiFiService::NetworkProperties::UpdateFromValue(
   return false;
 }
 
-std::string WiFiService::NetworkProperties::MacAddressAsString(
-    const uint8 mac_as_int[6]) {
+std::string NetworkProperties::MacAddressAsString(const uint8 mac_as_int[6]) {
   // mac_as_int is big-endian. Write in byte chunks.
   // Format is XX:XX:XX:XX:XX:XX.
   static const char* const kMacFormatString = "%02x:%02x:%02x:%02x:%02x:%02x";
@@ -110,8 +103,8 @@ std::string WiFiService::NetworkProperties::MacAddressAsString(
                             mac_as_int[5]);
 }
 
-bool WiFiService::NetworkProperties::OrderByType(const NetworkProperties& l,
-                                                 const NetworkProperties& r) {
+bool NetworkProperties::OrderByType(const NetworkProperties& l,
+                                    const NetworkProperties& r) {
   if (l.connection_state != r.connection_state)
     return l.connection_state < r.connection_state;
   // This sorting order is needed only for browser_tests, which expect this