| Index: chrome/browser/chromeos/login/network_screen_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc
|
| index 7a7694b317bb0958485fdaaf9b9958ecaa93afec..e31bac88bbe8bd381f1c19754cf74d4804d3c745 100644
|
| --- a/chrome/browser/chromeos/login/network_screen_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc
|
| @@ -364,8 +364,8 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, WifiSelected) {
|
| network_screen->ItemChanged(&combobox, 0, 1);
|
| network_view->SetSelectedNetworkItem(1);
|
| EXPECT_CALL(*mock_network_library_,
|
| - ConnectToWifiNetwork(A<WifiNetwork>(), string16(), string16(),
|
| - string16()))
|
| + ConnectToWifiNetwork(A<WifiNetwork>(), std::string(),
|
| + std::string(), std::string()))
|
| .Times(1);
|
| ui_test_utils::RunAllPendingInMessageLoop();
|
| NetworkChangedExpectations(true);
|
| @@ -482,8 +482,8 @@ IN_PROC_BROWSER_TEST_F(NetworkScreenTest, WifiWaiting) {
|
| network_screen->ItemChanged(&combobox, 0, 1);
|
| network_view->SetSelectedNetworkItem(1);
|
| EXPECT_CALL(*mock_network_library_,
|
| - ConnectToWifiNetwork(A<WifiNetwork>(), string16(), string16(),
|
| - string16()))
|
| + ConnectToWifiNetwork(A<WifiNetwork>(), std::string(),
|
| + std::string(), std::string()))
|
| .Times(1);
|
| ui_test_utils::RunAllPendingInMessageLoop();
|
| NetworkChangedExpectations(true);
|
|
|