chromium-os:5494 Networks with identical names not handled properly.

chrome/browser/chromeos/login/network_screen.cc

Index: chrome/browser/chromeos/login/network_screen.cc
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index d35a98e9f7b44e43d539a68439e1048b90901db9..5e305a3af136a01a104c2d75653b900515748320 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -161,16 +161,16 @@ void NetworkScreen::UpdateStatus(NetworkLibrary* network) {
     StopWaitingForConnection(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
   } else if (network->wifi_connected()) {
-    StopWaitingForConnection(ASCIIToUTF16(network->wifi_name()));
+    StopWaitingForConnection(ASCIIToUTF16(network->wifi_network().name()));
   } else if (network->cellular_connected()) {
-    StopWaitingForConnection(ASCIIToUTF16(network->cellular_name()));
+    StopWaitingForConnection(ASCIIToUTF16(network->cellular_network().name()));
   } else if (network->ethernet_connecting()) {
     WaitForConnection(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
   } else if (network->wifi_connecting()) {
-    WaitForConnection(ASCIIToUTF16(network->wifi_name()));
+    WaitForConnection(ASCIIToUTF16(network->wifi_network().name()));
   } else if (network->cellular_connecting()) {
-    WaitForConnection(ASCIIToUTF16(network->cellular_name()));
+    WaitForConnection(ASCIIToUTF16(network->cellular_network().name()));
   } else {
     StopWaitingForConnection(network_id_);
   }