Use EapMethod to provide correct network error message

BUG=297374
R=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/24644005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226246 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 0 deletions

diff --git a/chromeos/network/network_state.cc b/chromeos/network/network_state.cc
index 6c41f41..ae779de 100644
--- a/chromeos/network/network_state.cc
+++ b/chromeos/network/network_state.cc
@@ -126,6 +126,8 @@ bool NetworkState::PropertyChanged(const std::string& key,
     return GetStringValue(key, value, &roaming_);
   } else if (key == shill::kSecurityProperty) {
     return GetStringValue(key, value, &security_);
+  } else if (key == shill::kEapMethodProperty) {
+    return GetStringValue(key, value, &eap_method_);
   } else if (key == shill::kUIDataProperty) {
     scoped_ptr<NetworkUIData> new_ui_data =
         shill_property_util::GetUIDataFromValue(value);
@@ -196,6 +198,8 @@ void NetworkState::GetProperties(base::DictionaryValue* dictionary) const {
                                             roaming_);
   dictionary->SetStringWithoutPathExpansion(shill::kSecurityProperty,
                                             security_);
+  dictionary->SetStringWithoutPathExpansion(shill::kEapMethodProperty,
+                                            eap_method_);
   // Proxy config and ONC source are intentionally omitted: These properties are
   // placed in NetworkState to transition ProxyConfigServiceImpl from
   // NetworkLibrary to the new network stack. The networking extension API
diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index de94a38..b736a2b 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -47,6 +47,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
 
   // Accessors
   const std::string& security() const { return security_; }
+  const std::string& eap_method() const { return eap_method_; }
   const std::string& device_path() const { return device_path_; }
   const std::string& guid() const { return guid_; }
   const std::string& connection_state() const { return connection_state_; }
@@ -116,6 +117,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   // Instead use NetworkConfigurationHandler::GetProperties() to asynchronously
   // request properties from Shill.
   std::string security_;
+  std::string eap_method_;  // Needed for WiFi EAP networks
   std::string device_path_;
   std::string guid_;
   std::string connection_state_;