Reverting 18872.

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/browser_window.h"
 #include "chrome/browser/find_bar_controller.h"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
@@ skipping 539 matching lines @@
 }
 
 // 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);
 
-  gfx::NativeView browser_view = browser()->window()->GetNativeHandle();
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManagerForNativeView(browser_view);
+  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->GetCurrentTargetForAccelerator(escape);
   EXPECT_TRUE(old_target != NULL);
 
   // Open the Find box.
   browser()->ShowFindBar();
 
@@ skipping 29 matching lines @@
   // backspace, but that's been proven flaky in the past, so we go straight to
   // tab_contents.
   TabContents* tab_contents = browser()->GetSelectedTabContents();
   // Stop the (non-existing) find operation, and clear the selection (which
   // signals the UI is still active).
   tab_contents->StopFinding(true);
   // Make sure the Find UI flag hasn't been cleared, it must be so that the UI
   // still responds to browser window resizing.
   ASSERT_TRUE(tab_contents->find_ui_active());
 }