Provide Shill Error to failure notification

ash/system/chromeos/network/network_state_notifier.cc

 // Copyright (c) 2012 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 "ash/system/chromeos/network/network_state_notifier.h"
 
 #include "ash/shell.h"
 #include "ash/system/chromeos/network/network_connect.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 178 matching lines @@
           l10n_util::GetStringFUTF16(IDS_NETWORK_CELLULAR_ACTIVATED,
                                      UTF8ToUTF16((cellular->name()))),
           icon,
           system_notifier::NOTIFIER_NETWORK,
           base::Bind(&ash::network_connect::ShowNetworkSettings,
                      cellular->path())));
 }
 
 void NetworkStateNotifier::ShowNetworkConnectError(
     const std::string& error_name,
+    const std::string& shill_error,
     const std::string& service_path) {
   if (service_path.empty()) {
     base::DictionaryValue shill_properties;
-    ShowConnectErrorNotification(error_name, service_path, shill_properties);
+    ShowConnectErrorNotification(error_name, shill_error, service_path,
+                                 shill_properties);
     return;
   }
   // Get the up-to-date properties for the network and display the error.
   NetworkHandler::Get()->network_configuration_handler()->GetProperties(
       service_path,
       base::Bind(&NetworkStateNotifier::ConnectErrorPropertiesSucceeded,
-                 weak_ptr_factory_.GetWeakPtr(), error_name),
+                 weak_ptr_factory_.GetWeakPtr(), error_name, shill_error),
       base::Bind(&NetworkStateNotifier::ConnectErrorPropertiesFailed,
-                 weak_ptr_factory_.GetWeakPtr(), error_name, service_path));
+                 weak_ptr_factory_.GetWeakPtr(), error_name, shill_error,
+                 service_path));
 }
 
 void NetworkStateNotifier::ConnectErrorPropertiesSucceeded(
     const std::string& error_name,
+    const std::string& shill_error,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
-  ShowConnectErrorNotification(error_name, service_path, shill_properties);
+  ShowConnectErrorNotification(error_name, shill_error, service_path,
+                               shill_properties);
 }
 
 void NetworkStateNotifier::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) {
   base::DictionaryValue shill_properties;
-  ShowConnectErrorNotification(error_name, service_path, shill_properties);
+  ShowConnectErrorNotification(error_name, shill_error, service_path,
+                               shill_properties);
 }
 
 void NetworkStateNotifier::ShowConnectErrorNotification(
     const std::string& error_name,
+    const std::string& shill_error,
     const std::string& service_path,
     const base::DictionaryValue& shill_properties) {
   string16 error = GetConnectErrorString(error_name);
   if (error.empty()) {
-    std::string network_error;
-    shill_properties.GetStringWithoutPathExpansion(
-        flimflam::kErrorProperty, &network_error);
+    // Service.Error gets cleared shortly after State transitions to Failure,
+    // so rely on |shill_error| unless empty.
+    std::string network_error = shill_error;
+    if (network_error.empty()) {
+      shill_properties.GetStringWithoutPathExpansion(
+          flimflam::kErrorProperty, &network_error);
+    }
     error = network_connect::ErrorString(network_error);
     if (error.empty())
       error = l10n_util::GetStringUTF16(IDS_CHROMEOS_NETWORK_ERROR_UNKNOWN);
   }
   NET_LOG_ERROR("Connect error notification: " + UTF16ToUTF8(error),
                 service_path);
 
   std::string network_name =
       chromeos::shill_property_util::GetNameFromProperties(service_path,
                                                            shill_properties);
@@ skipping 23 matching lines @@
 
   ShowErrorNotification(
       network_connect::kNetworkConnectNotificationId,
       network_type,
       l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE),
       error_msg,
       base::Bind(&network_connect::ShowNetworkSettings, service_path));
 }
 
 }  // namespace ash