Index: chrome/browser/views/find_bar_host_interactive_uitest.cc |
diff --git a/chrome/browser/views/find_bar_host_interactive_uitest.cc b/chrome/browser/views/find_bar_host_interactive_uitest.cc |
index 0b66cc9ad9e0201473e47d162837d34f9c533d8e..e0819e64239319e2becd715b9a4d7dedb95d850c 100644 |
--- a/chrome/browser/views/find_bar_host_interactive_uitest.cc |
+++ b/chrome/browser/views/find_bar_host_interactive_uitest.cc |
@@ -53,9 +53,17 @@ class FindInPageTest : public InProcessBrowserTest { |
int GetFocusedViewID() { |
#if defined(TOOLKIT_VIEWS) |
+#if defined(OS_LINUX) |
+ // See http://crbug.com/26873 . |
+ views::FocusManager* focus_manager = |
+ views::FocusManager::GetFocusManagerForNativeView( |
+ GTK_WIDGET(browser()->window()->GetNativeHandle())); |
+#else |
views::FocusManager* focus_manager = |
views::FocusManager::GetFocusManagerForNativeView( |
browser()->window()->GetNativeHandle()); |
+#endif |
+ |
if (!focus_manager) { |
NOTREACHED(); |
return -1; |
@@ -135,7 +143,7 @@ IN_PROC_BROWSER_TEST_F(FindInPageTest, FocusRestore) { |
browser()->Find(); |
EXPECT_EQ(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD, GetFocusedViewID()); |
ui_test_utils::FindInPage(browser()->GetSelectedTabContents(), |
- L"a", true, false, NULL); |
+ ASCIIToUTF16("a"), true, false, NULL); |
browser()->GetFindBarController()->EndFindSession( |
FindBarController::kKeepSelection); |
EXPECT_EQ(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW, GetFocusedViewID()); |