Fix 12729: Find box doesn't unregister Esc accelerator....

chrome/browser/views/find_bar_win_browsertest.cc

 // Copyright (c) 2009 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 "base/message_loop.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
 #include "chrome/browser/views/find_bar_win.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "views/focus/focus_manager.h"
 
 const std::wstring kSimplePage = L"404_is_enough_for_us.html";
 const std::wstring kFramePage = L"files/find_in_page/frames.html";
 const std::wstring kFrameData = L"files/find_in_page/framedata_general.html";
 const std::wstring kUserSelectPage = L"files/find_in_page/user-select.html";
 const std::wstring kCrashPage = L"files/find_in_page/crash_1341577.html";
 const std::wstring kTooFewMatchesPage = L"files/find_in_page/bug_1155639.html";
 const std::wstring kEndState = L"files/find_in_page/end_state.html";
 const std::wstring kPrematureEnd = L"files/find_in_page/premature_end.html";
 const std::wstring kMoveIfOver = L"files/find_in_page/move_if_obscuring.html";
@@ skipping 486 matching lines @@
   GetFindBarWindowInfo(&position, &fully_visible);
   EXPECT_EQ(start_position, position);
   EXPECT_TRUE(fully_visible);
 }
 
 // Make sure F3 in a new tab works if Find has previous string to search for.
 IN_PROC_BROWSER_TEST_F(FindInPageControllerTest,
                        FindNextInNewTabUsesPrepopulate) {
   HTTPTestServer* server = StartHTTPServer();
 
-  // First we navigate to our special focus tracking page.
+  // First we navigate to any page.
   GURL url = server->TestServerPageW(kSimplePage);
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Search for 'no_match'. No matches should be found.
   int ordinal = 0;
   EXPECT_EQ(0, FindInPage(L"no_match", FWD, IGNORE_CASE, &ordinal));
   EXPECT_EQ(0, ordinal);
 
   // Open another tab (tab B).
   browser()->NewTab();
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Simulate what happens when you press F3 for FindNext. We should get a
   // response here (a hang means search was aborted).
   EXPECT_EQ(0, FindInPage(std::wstring(), FWD, IGNORE_CASE, &ordinal));
   EXPECT_EQ(0, ordinal);
 
   // Open another tab (tab C).
   browser()->NewTab();
   ui_test_utils::NavigateToURL(browser(), url);
 
   // Simulate what happens when you press F3 for FindNext. We should get a
   // response here (a hang means search was aborted).
   EXPECT_EQ(0, FindInPage(std::wstring(), FWD, IGNORE_CASE, &ordinal));
   EXPECT_EQ(0, ordinal);
 }
+
+// Make sure Find box grabs the Esc accelerator and restores it again.
+IN_PROC_BROWSER_TEST_F(FindInPageControllerTest, AcceleratorRestoring) {
+  HTTPTestServer* server = StartHTTPServer();
+
+  // First we navigate to any page.
+  GURL url = server->TestServerPageW(kSimplePage);
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  views::FocusManager* focus_manager = views::FocusManager::GetFocusManager(
+      browser()->window()->GetNativeHandle());
+
+  // See where Escape is registered.
+  views::Accelerator escape(VK_ESCAPE, false, false, false);
+  views::AcceleratorTarget* old_target =
+      focus_manager->GetTargetForAccelerator(escape);
+  EXPECT_TRUE(old_target != NULL);
+
+  // Open the Find box.
+  browser()->ShowFindBar();
+
+  // Our Find bar should be the new target.
+  views::AcceleratorTarget* new_target =
+      focus_manager->GetTargetForAccelerator(escape);
+
+  EXPECT_TRUE(new_target != NULL);
+  EXPECT_NE(new_target, old_target);
+
+  // Close the Find box.
+  browser()->find_bar()->EndFindSession();
+
+  // The accelerator for Escape should be back to what it was before.
+  EXPECT_EQ(old_target, focus_manager->GetTargetForAccelerator(escape));
+}