Re-lands 58186:

views/focus/accelerator_handler_gtk_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 <gdk/gdkkeysyms.h>
 
 #include "gfx/rect.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/view.h"
 #include "views/window/window_gtk.h"
 #include "views/window/window_delegate.h"
 
 namespace views {
 
 class AcceleratorHandlerGtkTest
     : public testing::Test,
       public WindowDelegate,
       public AcceleratorTarget {
  public:
   AcceleratorHandlerGtkTest()
-      : kMenuAccelerator(base::VKEY_MENU, false, false, false),
-        kHomepageAccelerator(base::VKEY_HOME, false, false, true),
+      : kMenuAccelerator(app::VKEY_MENU, false, false, false),
+        kHomepageAccelerator(app::VKEY_HOME, false, false, true),
         content_view_(NULL) {
   }
 
   virtual void SetUp() {
     window_ = Window::CreateChromeWindow(
         NULL, gfx::Rect(0, 0, 500, 500), this);
     window_->Show();
     FocusManager* focus_manager = static_cast<WindowGtk*>(window_)->
         GetFocusManager();
     focus_manager->RegisterAccelerator(kMenuAccelerator, this);
@@ skipping 150 matching lines @@
 
   // Release Alt - now this should trigger the menu shortcut.
   evt = CreateKeyEvent(GDK_KEY_RELEASE, GDK_Alt_L, 0);
   evt.hardware_keycode = 0x40;
   EXPECT_TRUE(handler.Dispatch(reinterpret_cast<GdkEvent*>(&evt)));
 
   ASSERT_TRUE(menu_pressed_);
 }
 
 }  // namespace views