Provide Shill Error to failure notification

ash/system/chromeos/network/network_state_notifier.h

Index: ash/system/chromeos/network/network_state_notifier.h
diff --git a/ash/system/chromeos/network/network_state_notifier.h b/ash/system/chromeos/network/network_state_notifier.h
index 612dfbfb1acb1f2cf432a43d3d6ac352c2fbb0c2..1a835bbbe9ba33f89dd19a2d4d98feff1066d077 100644
--- a/ash/system/chromeos/network/network_state_notifier.h
+++ b/ash/system/chromeos/network/network_state_notifier.h
@@ -46,24 +46,28 @@ class ASH_EXPORT NetworkStateNotifier :
 
   // Show a connection error notification. If |error_name| matches an error
   // defined in NetworkConnectionHandler for connect, configure, or activation
-  // failed, then the associated message is shown, otherwise the Shill
-  // error for Service.Error is used (from network_connect::ErrorString), or
-  // "Unknown network error".
+  // failed, then the associated message is shown, otherwise |shill_error|
+  // is expected to contain Service.Error (which might get cleared before
+  // GetProperties returns).
   void ShowNetworkConnectError(const std::string& error_name,
+                               const std::string& shill_error,
                                const std::string& service_path);
 
  private:
   void ConnectErrorPropertiesSucceeded(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
       const base::DictionaryValue& shill_properties);
   void ConnectErrorPropertiesFailed(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
-      const std::string& shill_error_name,
+      const std::string& shill_connect_error,
       scoped_ptr<base::DictionaryValue> shill_error_data);
   void ShowConnectErrorNotification(
       const std::string& error_name,
+      const std::string& shill_error,
       const std::string& service_path,
       const base::DictionaryValue& shill_properties);