Re-lands 58186:

chrome/browser/chromeos/login/wizard_controller_browsertest.cc

Index: chrome/browser/chromeos/login/wizard_controller_browsertest.cc
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index 1fa0261b81c128ba57a075451413f7a698945b51..67d4fde68c579187fde0c1f16029cd9b638ff6bc 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -203,12 +203,12 @@ IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, Accelerators) {
 
   views::FocusManager* focus_manager =
       controller()->contents()->GetFocusManager();
-  views::Accelerator accel_account_screen(base::VKEY_A, false, true, true);
-  views::Accelerator accel_login_screen(base::VKEY_L, false, true, true);
-  views::Accelerator accel_network_screen(base::VKEY_N, false, true, true);
-  views::Accelerator accel_update_screen(base::VKEY_U, false, true, true);
-  views::Accelerator accel_image_screen(base::VKEY_I, false, true, true);
-  views::Accelerator accel_eula_screen(base::VKEY_E, false, true, true);
+  views::Accelerator accel_account_screen(app::VKEY_A, false, true, true);
+  views::Accelerator accel_login_screen(app::VKEY_L, false, true, true);
+  views::Accelerator accel_network_screen(app::VKEY_N, false, true, true);
+  views::Accelerator accel_update_screen(app::VKEY_U, false, true, true);
+  views::Accelerator accel_image_screen(app::VKEY_I, false, true, true);
+  views::Accelerator accel_eula_screen(app::VKEY_E, false, true, true);
 
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_account_screen_, Show()).Times(1);