Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/....

chrome/browser/chromeos/login/wizard_controller_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 "app/l10n_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/eula_view.h"
 #include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
@@ skipping 185 matching lines @@
   EXPECT_CALL(*mock_network_screen_, Hide()).Times(1);
   controller()->OnExit(chromeos::ScreenObserver::NETWORK_OFFLINE);
   EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());
 }
 
 IN_PROC_BROWSER_TEST_F(WizardControllerFlowTest, Accelerators) {
   EXPECT_EQ(controller()->GetNetworkScreen(), controller()->current_screen());
 
   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);
   EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_account_screen));
   EXPECT_EQ(controller()->GetAccountScreen(), controller()->current_screen());
 
   EXPECT_CALL(*mock_account_screen_, Hide()).Times(1);
   EXPECT_CALL(*mock_login_screen_, Show()).Times(1);
   EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_login_screen));
   EXPECT_EQ(controller()->GetLoginScreen(), controller()->current_screen());
@@ skipping 12 matching lines @@
   EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_image_screen));
   EXPECT_EQ(controller()->GetUserImageScreen(), controller()->current_screen());
 
   EXPECT_CALL(*mock_eula_screen_, Show()).Times(1);
   EXPECT_TRUE(focus_manager->ProcessAccelerator(accel_eula_screen));
   EXPECT_EQ(controller()->GetEulaScreen(), controller()->current_screen());
 }
 
 COMPILE_ASSERT(chromeos::ScreenObserver::EXIT_CODES_COUNT == 17,
                add_tests_for_new_control_flow_you_just_introduced);