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

chrome/browser/views/bookmark_bar_view_test.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 "app/keyboard_codes.h"
+#include "base/keyboard_codes.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/notification_service.h"
@@ skipping 850 matching lines @@
 
  private:
   void Step2() {
     // Menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // Send a down event, which should select the first item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, base::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step3));
   }
 
   void Step3() {
     // Make sure menu is showing and item is selected.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected());
 
     // Send a key down event, which should select the next item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, base::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step4));
   }
 
   void Step4() {
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     ASSERT_FALSE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected());
     ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(1)->IsSelected());
 
     // Send a right arrow to force the menu to open.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RIGHT, false, false, false, false,
+        NULL, base::VKEY_RIGHT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step5));
   }
 
   void Step5() {
     // Make sure the submenu is showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     views::MenuItemView* submenu = menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(submenu->IsSelected());
     ASSERT_TRUE(submenu->GetSubmenu());
     ASSERT_TRUE(submenu->GetSubmenu()->IsShowing());
 
     // Send a left arrow to close the submenu.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_LEFT, false, false, false, false,
+        NULL, base::VKEY_LEFT, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step6));
   }
 
   void Step6() {
     // Make sure the submenu is showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     views::MenuItemView* submenu = menu->GetSubmenu()->GetMenuItemAt(1);
     ASSERT_TRUE(submenu->IsSelected());
     ASSERT_TRUE(!submenu->GetSubmenu() || !submenu->GetSubmenu()->IsShowing());
 
     // Send a down arrow to wrap back to f1a
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_DOWN, false, false, false, false,
+        NULL, base::VKEY_DOWN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step7));
   }
 
   void Step7() {
     // Make sure menu is showing and item is selected.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
     ASSERT_TRUE(menu->GetSubmenu()->GetMenuItemAt(0)->IsSelected());
 
     // Send enter, which should select the item.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RETURN, false, false, false, false,
+        NULL, base::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest10::Step8));
   }
 
   void Step8() {
     ASSERT_TRUE(
         model_->GetBookmarkBarNode()->GetChild(0)->GetChild(0)->GetURL() ==
         navigator_.url_);
     Done();
   }
 };
@@ skipping 34 matching lines @@
 
     // Right click on the first child to get its context menu.
     ui_controls::MoveMouseToCenterAndPress(child_menu, ui_controls::RIGHT,
         ui_controls::DOWN | ui_controls::UP, NULL);
     // Step3 will be invoked by ContextMenuNotificationObserver.
   }
 
   void Step3() {
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_ESCAPE, false, false, false, false,
+        NULL, base::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest11::Step4));
   }
 
   void Step4() {
     // Make sure the context menu is no longer showing.
     views::MenuItemView* menu = bb_view_->GetContextMenu();
     ASSERT_TRUE(!menu || !menu->GetSubmenu() ||
                 !menu->GetSubmenu()->IsShowing());
 
     // But the menu should be showing.
@@ skipping 68 matching lines @@
         ui_controls::DOWN | ui_controls::UP, NULL);
 
     // Delay until we send tab, otherwise the message box doesn't appear
     // correctly.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         CreateEventTask(this, &BookmarkBarViewTest12::Step4), 1000);
   }
 
   void Step4() {
     // Press tab to give focus to the cancel button.
-    ui_controls::SendKeyPress(NULL, app::VKEY_TAB, false, false, false, false);
+    ui_controls::SendKeyPress(NULL, base::VKEY_TAB, false, false, false, false);
 
     // For some reason return isn't processed correctly unless we delay.
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         CreateEventTask(this, &BookmarkBarViewTest12::Step5), 1000);
   }
 
   void Step5() {
     // And press enter so that the cancel button is selected.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_RETURN, false, false, false, false,
+        NULL, base::VKEY_RETURN, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest12::Step6));
   }
 
   void Step6() {
     // Do a delayed task to give the dialog time to exit.
     MessageLoop::current()->PostTask(
         FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest12::Step7));
   }
 
   void Step7() {
@@ skipping 108 matching lines @@
 
  private:
 
   void Step2() {
     // Menu should NOT be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu == NULL);
 
     // Send escape so that the context menu hides.
     ui_controls::SendKeyPressNotifyWhenDone(
-        NULL, app::VKEY_ESCAPE, false, false, false, false,
+        NULL, base::VKEY_ESCAPE, false, false, false, false,
         CreateEventTask(this, &BookmarkBarViewTest14::Step3));
   }
 
   void Step3() {
     Done();
   }
 
   ContextMenuNotificationObserver observer_;
 };
 
@@ skipping 102 matching lines @@
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
     ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);
 
     // Close the window.
     window_->Close();
     window_ = NULL;
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest16, DeleteMenu)