Re-lands 58186:

views/view_unittest.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 <map>
 
 #include "app/clipboard/clipboard.h"
-#include "base/keyboard_codes.h"
+#include "app/keyboard_codes.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/path.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/background.h"
 #include "views/controls/button/checkbox.h"
 #if defined(OS_WIN)
 #include "views/controls/button/native_button_win.h"
@@ skipping 802 matching lines @@
 // Accelerators
 ////////////////////////////////////////////////////////////////////////////////
 bool TestView::AcceleratorPressed(const Accelerator& accelerator) {
   accelerator_count_map_[accelerator]++;
   return true;
 }
 
 #if defined(OS_WIN)
 TEST_F(ViewTest, ActivateAccelerator) {
   // Register a keyboard accelerator before the view is added to a window.
-  views::Accelerator return_accelerator(base::VKEY_RETURN, false, false, false);
+  views::Accelerator return_accelerator(app::VKEY_RETURN, false, false, false);
   TestView* view = new TestView();
   view->Reset();
   view->AddAccelerator(return_accelerator);
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 0);
 
   // Create a window and add the view as its child.
   WidgetWin window;
   window.Init(NULL, gfx::Rect(0, 0, 100, 100));
   window.set_delete_on_destroy(false);
   window.set_window_style(WS_OVERLAPPEDWINDOW);
   RootView* root = window.GetRootView();
   root->AddChildView(view);
 
   // Get the focus manager.
   views::FocusManager* focus_manager =
       views::FocusManager::GetFocusManagerForNativeView(window.GetNativeView());
   ASSERT_TRUE(focus_manager);
 
   // Hit the return key and see if it takes effect.
   EXPECT_TRUE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
 
   // Hit the escape key. Nothing should happen.
-  views::Accelerator escape_accelerator(base::VKEY_ESCAPE, false, false, false);
+  views::Accelerator escape_accelerator(app::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);
 
   // Now register the escape key and hit it again.
   view->AddAccelerator(escape_accelerator);
   EXPECT_TRUE(focus_manager->ProcessAccelerator(escape_accelerator));
   EXPECT_EQ(view->accelerator_count_map_[return_accelerator], 1);
   EXPECT_EQ(view->accelerator_count_map_[escape_accelerator], 1);
 
@@ skipping 235 matching lines @@
     window->Show();
     focus_manager_ = test_dialog_->contents_->GetFocusManager();
     ASSERT_TRUE(focus_manager_ != NULL);
     client_view_ =
         static_cast<views::DialogClientView*>(window->GetClientView());
     ok_button_ = client_view_->ok_button();
     cancel_button_ = client_view_->cancel_button();
   }
 
   void SimularePressingEnterAndCheckDefaultButton(ButtonID button_id) {
-    KeyEvent event(Event::ET_KEY_PRESSED, base::VKEY_RETURN, 0, 0, 0);
+    KeyEvent event(Event::ET_KEY_PRESSED, app::VKEY_RETURN, 0, 0, 0);
     focus_manager_->OnKeyEvent(event);
     switch (button_id) {
       case OK:
         EXPECT_TRUE(test_dialog_->oked_);
         EXPECT_FALSE(test_dialog_->canceled_);
         EXPECT_FALSE(test_dialog_->last_pressed_button_);
         break;
       case CANCEL:
         EXPECT_FALSE(test_dialog_->oked_);
         EXPECT_TRUE(test_dialog_->canceled_);
@@ skipping 223 matching lines @@
 #endif
 }
 
 TEST_F(ViewTest, ChangeNativeViewHierarchyChangeHierarchy) {
   // TODO(georgey): Fix the test for Linux
 #if defined(OS_WIN)
   TestChangeNativeViewHierarchy test(this);
   test.CheckChangingHierarhy();
 #endif
 }