Revert "BookmarkBarView tests fixes"

views/controls/menu/menu_controller.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 "views/controls/menu/menu_controller.h"
 
 #include "app/l10n_util.h"
 #include "app/os_exchange_data.h"
 #include "base/i18n/rtl.h"
 #include "base/keyboard_codes.h"
 #include "base/time.h"
 #include "gfx/canvas.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
 #include "views/drag_utils.h"
 #include "views/screen.h"
 #include "views/view_constants.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
-#if defined(OS_LINUX)
-#include "base/keyboard_code_conversion_gtk.h"
-#endif
 
 using base::Time;
 using base::TimeDelta;
 
 // Period of the scroll timer (in milliseconds).
 static const int kScrollTimerMS = 30;
 
 // Delay, in ms, between when menus are selected are moused over and the menu
 // appears.
 static const int kShowDelay = 400;
@@ skipping 657 matching lines @@
 
 #else
 bool MenuController::Dispatch(GdkEvent* event) {
   gtk_main_do_event(event);
 
   if (exit_type_ == EXIT_ALL)
     return false;
 
   switch (event->type) {
     case GDK_KEY_PRESS: {
-      base::KeyboardCode win_keycode =
-          base::WindowsKeyCodeForGdkKeyCode(event->key.keyval);
-      if (!OnKeyDown(win_keycode))
+      if (!OnKeyDown(event->key.keyval))
         return false;
       guint32 keycode = gdk_keyval_to_unicode(event->key.keyval);
       if (keycode)
         return !SelectByChar(keycode);
       return true;
     }
 
     default:
       break;
   }
 
   return exit_type_ == EXIT_NONE;
 }
 #endif
 
 bool MenuController::OnKeyDown(int key_code
 #if defined(OS_WIN)
                                , const MSG& msg
 #else
 #endif
                                ) {
   DCHECK(blocking_run_);
-  DLOG(WARNING) << "OnKeyDown: " << key_code;
 
   switch (key_code) {
     case base::VKEY_UP:
       IncrementSelection(-1);
       break;
 
     case base::VKEY_DOWN:
       IncrementSelection(1);
       break;
 
@@ skipping 765 matching lines @@
   if (!scroll_task_.get())
     scroll_task_.reset(new MenuScrollTask());
   scroll_task_->Update(part);
 }
 
 void MenuController::StopScrolling() {
   scroll_task_.reset(NULL);
 }
 
 }  // namespace views