Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(956)

Unified Diff: chrome/browser/ui/browser_focus_uitest.cc

Issue 11728003: Change ExecuteJavaScript* helper functions in browser_test_utils.{h,cc} (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adding files for gpu_tests and NaCl browser tests. Created 7 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/browser_focus_uitest.cc
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 698ff0c58cd08817f4194e7fb3207aea2d7fcfca..f53588e37a451bedd428422a138309be909f23c6 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -465,8 +465,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
focused_browser->window()->Activate();
ASSERT_TRUE(content::ExecuteJavaScript(
- chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(), L"",
- L"stealFocus();"));
+ chrome::GetActiveWebContents(unfocused_browser)->GetRenderViewHost(),
+ "",
+ "stealFocus();"));
// Make sure the first browser is still active.
EXPECT_TRUE(focused_browser->window()->IsActive());
@@ -484,8 +485,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {
chrome::FocusLocationBar(browser());
ASSERT_TRUE(content::ExecuteJavaScript(
- chrome::GetActiveWebContents(browser())->GetRenderViewHost(), L"",
- L"stealFocus();"));
+ chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
+ "",
+ "stealFocus();"));
// Make sure the location bar is still focused.
ASSERT_TRUE(IsViewFocused(location_bar_focus_view_id_));
@@ -531,8 +533,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
std::string actual;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
- L"",
- L"window.domAutomationController.send(getFocusedElement());",
+ "",
+ "window.domAutomationController.send(getFocusedElement());",
&actual));
ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
@@ -604,8 +606,8 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversal) {
std::string actual;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
- L"",
- L"window.domAutomationController.send(getFocusedElement());",
+ "",
+ "window.domAutomationController.send(getFocusedElement());",
&actual));
ASSERT_STREQ(next_element, actual.c_str());
}
@@ -662,8 +664,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
// 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(), L"",
- L"window.domAutomationController.send(getFocusedElement());",
+ interstitial_page->render_view_host(),
+ "",
+ "window.domAutomationController.send(getFocusedElement());",
&actual));
ASSERT_STREQ(kExpElementIDs[j], actual.c_str());
@@ -722,8 +725,9 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) {
// 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(), L"",
- L"window.domAutomationController.send(getFocusedElement());",
+ interstitial_page->render_view_host(),
+ "",
+ "window.domAutomationController.send(getFocusedElement());",
&actual));
ASSERT_STREQ(kExpElementIDs[6 - j], actual.c_str());
}
« no previous file with comments | « chrome/browser/tab_contents/view_source_browsertest.cc ('k') | chrome/browser/ui/find_bar/find_bar_host_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698