Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from bas...

views/view_unittest.cc

Index: views/view_unittest.cc
===================================================================
--- views/view_unittest.cc	(revision 58389)
+++ views/view_unittest.cc	(working copy)
@@ -5,7 +5,7 @@
 #include <map>
 
 #include "app/clipboard/clipboard.h"
-#include "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ -828,7 +828,7 @@
 #if defined(OS_WIN)
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
-  views::Accelerator return_accelerator(app::VKEY_RETURN, false, false, false);
+  views::Accelerator return_accelerator(base::VKEY_RETURN, false, false, false);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
@@ -852,7 +852,7 @@
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
 
   // Hit the escape key. Nothing should happen.
-  views::Accelerator escape_accelerator(app::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape_accelerator(base::VKEY_ESCAPE, false, false, false);
   EXPECT_FALSE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
   EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 0);
@@ -1108,7 +1108,7 @@
   }
 
   void SimularePressingEnterAndCheckDefaultButton(ButtonID button_id) {
-    KeyEvent event(Event::ET_KEY_PRESSED, app::VKEY_RETURN, 0, 0, 0);
+    KeyEvent event(Event::ET_KEY_PRESSED, base::VKEY_RETURN, 0, 0, 0);
     focus_manager_->OnKeyEvent(event);
     switch (button_id) {
       case OK: