Re-lands 58186:

chrome/browser/views/browser_keyboard_accessibility_test_win.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 "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/views/chrome_views_delegate.h"
 #include "chrome/browser/views/frame/browser_view.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "views/view.h"
 #include "views/accessibility/view_accessibility.h"
 #include "views/widget/widget.h"
 #include "views/window/window.h"
 
@@ skipping 96 matching lines @@
   for (int i = 0; i < 3; ++i) {
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Iteration no. " << i;
 
     TabCyclerForwardAndBack(current_view_native_window());
 
 
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event...";
     ui_controls::SendKeyPressNotifyWhenDone(current_view_native_window(),
-                                            base::VKEY_TAB,
+                                            app::VKEY_TAB,
                                             true, false, false, false,
                                             new MessageLoop::QuitTask());
     set_waiting(true);
     ui_test_utils::RunMessageLoop();
   }
 }
 
 // This test is disabled, see bug 50864.
 IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
                        DISABLED_TabInPasswordManager) {
@@ skipping 13 matching lines @@
                        DISABLED_TabInTaskManager) {
   browser()->OpenTaskManager();
   TabCyclerForwardAndBack(current_view_native_window());
 }
 
 // This test is disabled, see bug 50864.
 IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
                        DISABLED_TabInToolbar) {
   gfx::NativeWindow native_window = browser()->window()->GetNativeHandle();
   ui_controls::SendKeyPressNotifyWhenDone(native_window,
-                                          base::VKEY_T,
+                                          app::VKEY_T,
                                           false, true, true, false,
                                           new MessageLoop::QuitTask());
   set_waiting(true);
   ui_test_utils::RunMessageLoop();
   TabCyclerForwardAndBack(current_view_native_window());
 }
 
 // This test is disabled, see bug 50864.
 IN_PROC_BROWSER_TEST_F(BrowserKeyboardAccessibility,
                        DISABLED_TabInUpdateChromeDialog) {
@@ skipping 23 matching lines @@
   views::View* first_focused_item = current_view();
 
   ASSERT_TRUE(first_focused_item != NULL);
 
   views::View* next_focused_item = first_focused_item;
 
   // Keep tabbing until we reach the originally focused view.
   do {
     // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
     LOG(ERROR) << "Sending TAB key event.";
-    ui_controls::SendKeyPressNotifyWhenDone(hwnd, base::VKEY_TAB,
+    ui_controls::SendKeyPressNotifyWhenDone(hwnd, app::VKEY_TAB,
         false, !forward_tab, false, false, new MessageLoop::QuitTask());
     set_waiting(true);
     ui_test_utils::RunMessageLoop();
     next_focused_item = current_view();
   } while (first_focused_item != next_focused_item);
   // TODO(phajdan.jr): remove logging after fixing http://crbug.com/50663.
   LOG(ERROR) << "After second loop.";
 }
 
 }  // namespace