Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: chrome/browser/chromeos/login/network_screen_browsertest.cc

Issue 2869019: Don't generate a certificate browse button or passphrase field if cert path contains SETTINGS: (Closed)
Patch Set: Simplified SETTINGS: parsing. Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);

Powered by Google App Engine
This is Rietveld 408576698