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

chrome/browser/chromeos/cros/cros_mock.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 "chrome/browser/chromeos/cros/cros_mock.h"
 
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "chrome/browser/browser.h"
@@ skipping 297 matching lines @@
       .WillRepeatedly((Return(false)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_network_library_, wifi_networks())
       .Times(1)
       .WillRepeatedly((ReturnRef(wifi_networks_)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_network_library_, wifi_available())
       .Times(1)
       .WillRepeatedly((Return(false)))
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_network_library_, wifi_name())
+  EXPECT_CALL(*mock_network_library_, wifi_network())
       .Times(1)
-      .WillRepeatedly((ReturnRef(empty_string_)))
+      .WillRepeatedly((ReturnRef(wifi_network_)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_network_library_, cellular_networks())
       .Times(1)
       .WillRepeatedly((ReturnRef(cellular_networks_)))
       .RetiresOnSaturation();
-  EXPECT_CALL(*mock_network_library_, cellular_name())
+  EXPECT_CALL(*mock_network_library_, cellular_network())
       .Times(1)
-      .WillRepeatedly((ReturnRef(empty_string_)))
+      .WillRepeatedly((ReturnRef(cellular_network_)))
       .RetiresOnSaturation();
   EXPECT_CALL(*mock_network_library_, cellular_available())
       .Times(1)
       .WillRepeatedly((Return(false)))
       .RetiresOnSaturation();
 
   EXPECT_CALL(*mock_network_library_, RemoveObserver(_))
       .Times(1)
       .RetiresOnSaturation();
 }
@@ skipping 97 matching lines @@
     test_api()->SetScreenLockLibrary(NULL, false);
   if (mock_speech_synthesis_library_)
     test_api()->SetSpeechSynthesisLibrary(NULL, false);
   if (mock_system_library_)
     test_api()->SetSystemLibrary(NULL, false);
   if (mock_touchpad_library_)
     test_api()->SetTouchpadLibrary(NULL, false);
 }
 
 }  // namespace chromeos