| Index: chrome/browser/ui/browser_focus_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/ui/browser_focus_uitest.cc (revision 174946)
|
| +++ chrome/browser/ui/browser_focus_uitest.cc (working copy)
|
| @@ -465,9 +465,8 @@
|
| focused_browser->window()->Activate();
|
|
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(),
|
| - "",
|
| - "stealFocus();"));
|
| + chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(), L"",
|
| + L"stealFocus();"));
|
|
|
| // Make sure the first browser is still active.
|
| EXPECT_TRUE(focused_browser->window()->IsActive());
|
| @@ -485,9 +484,8 @@
|
| chrome::FocusLocationBar(browser());
|
|
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - "stealFocus();"));
|
| + chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
|
| + L"stealFocus();"));
|
|
|
| // Make sure the location bar is still focused.
|
| ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_));
|
| @@ -533,8 +531,8 @@
|
| std::string actual;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(getFocusedElement());",
|
| + L"",
|
| + L"window.domAutomationController.send(getFocusedElement());",
|
| &actual));
|
| ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
|
|
|
| @@ -606,8 +604,8 @@
|
| std::string actual;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
|
| - "",
|
| - "window.domAutomationController.send(getFocusedElement());",
|
| + L"",
|
| + L"window.domAutomationController.send(getFocusedElement());",
|
| &actual));
|
| ASSERT_STREQ(next_element, actual.c_str());
|
| }
|
| @@ -664,9 +662,8 @@
|
| // Let's make sure the focus is on the expected element in the page.
|
| std::string actual;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| - interstitial_page->render_view_host(),
|
| - "",
|
| - "window.domAutomationController.send(getFocusedElement());",
|
| + interstitial_page->render_view_host(), L"",
|
| + L"window.domAutomationController.send(getFocusedElement());",
|
| &actual));
|
| ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
|
|
|
| @@ -725,9 +722,8 @@
|
| // Let's make sure the focus is on the expected element in the page.
|
| std::string actual;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| - interstitial_page->render_view_host(),
|
| - "",
|
| - "window.domAutomationController.send(getFocusedElement());",
|
| + interstitial_page->render_view_host(), L"",
|
| + L"window.domAutomationController.send(getFocusedElement());",
|
| &actual));
|
| ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str());
|
| }
|
|
|