2nd attempt to land http://codereview.chromium.org/1676002 for njw...

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 275 matching lines @@
   DummyComboboxModel combobox_model;
   views::Combobox combobox(&combobox_model);
 
   // Emulate combobox selection.
   EthernetExpectations(false, false);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(std::string());
   network_screen->ItemChanged(&combobox, 0, 1);
   network_view->SetSelectedNetworkItem(1);
   EXPECT_CALL(*mock_network_library_,
-              ConnectToWifiNetwork(A<WifiNetwork>(), string16()))
+              ConnectToWifiNetwork(A<WifiNetwork>(), string16(), string16(),
+                                   string16()))
       .Times(1);
   ui_test_utils::RunAllPendingInMessageLoop();
   ASSERT_EQ(2, network_screen->GetItemCount());
 
   // Emulate connecting to WiFi network.
   EthernetExpectations(false, false);
   SetupWifiNetwork(false, true);
   WifiExpectations(false, true);
   WifiCellularNetworksExpectations();
   WifiSsidExpectation(wifi_.ssid);
@@ skipping 68 matching lines @@
   SetupCellularNetwork(true, false);
   CellularExpectations(true, false);
   WifiCellularNetworksExpectations();
   CellularNameExpectation(cellular_.name);
   network_screen->NetworkChanged(network_library);
   ui_test_utils::RunAllPendingInMessageLoop();
   controller()->set_observer(NULL);
 }
 
 }  // namespace chromeos