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

chrome/browser/chromeos/login/network_screen_browsertest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "app/combobox_model.h"
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
@@ skipping 162 matching lines @@
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(true)));
-  std::string wifi_name = "wifi";
-  EXPECT_CALL(*mock_network_library_, wifi_name())
-      .WillOnce(ReturnRef(wifi_name));
+  WifiNetwork wifi;
+  EXPECT_CALL(*mock_network_library_, wifi_network())
+      .WillOnce(ReturnRef(wifi));
 
   network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(true));
 
@@ skipping 18 matching lines @@
   EXPECT_CALL(*mock_network_library_, wifi_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connecting())
       .WillOnce((Return(true)));
-  std::string cellular_name = "3G";
-  EXPECT_CALL(*mock_network_library_, cellular_name())
-      .WillOnce(ReturnRef(cellular_name));
+  CellularNetwork cellular;
+  EXPECT_CALL(*mock_network_library_, cellular_network())
+      .WillOnce(ReturnRef(cellular));
 
   network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce(Return(true));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(true));
 
@@ skipping 16 matching lines @@
   EXPECT_CALL(*mock_network_library_, ethernet_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, cellular_connected())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, ethernet_connecting())
       .WillOnce((Return(false)));
   EXPECT_CALL(*mock_network_library_, wifi_connecting())
       .WillOnce((Return(true)));
-  std::string wifi_name = "wifi";
-  EXPECT_CALL(*mock_network_library_, wifi_name())
-      .WillOnce(ReturnRef(wifi_name));
+  WifiNetwork wifi;
+  EXPECT_CALL(*mock_network_library_, wifi_network())
+      .WillOnce(ReturnRef(wifi));
   EXPECT_CALL(*mock_network_library_, Connected())
       .WillOnce(Return(false));
 
   network_screen->NetworkChanged(mock_network_library_);
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   network_screen->OnConnectionTimeout();
   EXPECT_FALSE(network_view->IsContinueEnabled());
   EXPECT_FALSE(network_view->IsConnecting());
 
   // Close infobubble with error message - it makes test stable.
   network_screen->ClearErrors();
 }
 
 }  // namespace chromeos