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

Unified Diff: chrome/browser/loadtimes_extension_bindings_browsertest.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/loadtimes_extension_bindings_browsertest.cc
diff --git a/chrome/browser/loadtimes_extension_bindings_browsertest.cc b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
index 893ccdb342fb1eb8105a0bfff4b22d76acc44dc4..a53f5cf20599a41c89ffd53412f291bd1678d3cf 100644
--- a/chrome/browser/loadtimes_extension_bindings_browsertest.cc
+++ b/chrome/browser/loadtimes_extension_bindings_browsertest.cc
@@ -21,20 +21,27 @@ class LoadtimesExtensionBindingsTest : public InProcessBrowserTest {
content::RenderViewHost* rvh =
chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"",
- L"window.before.firstPaintAfterLoadTime = 0;"
- L"window.before.firstPaintTime = 0;"
- L"window.after.firstPaintAfterLoadTime = 0;"
- L"window.after.firstPaintTime = 0;"));
+ rvh,
+ "",
+ "window.before.firstPaintAfterLoadTime = 0;"
+ "window.before.firstPaintTime = 0;"
+ "window.after.firstPaintAfterLoadTime = 0;"
+ "window.after.firstPaintTime = 0;"));
std::string before;
std::string after;
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- rvh, L"", L"window.domAutomationController.send("
- L"JSON.stringify(before))", &before));
+ rvh,
+ "",
+ "window.domAutomationController.send("
+ " JSON.stringify(before))",
+ &before));
ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
- rvh, L"", L"window.domAutomationController.send("
- L"JSON.stringify(after))", &after));
+ rvh,
+ "",
+ "window.domAutomationController.send("
+ " JSON.stringify(after))",
+ &after));
EXPECT_EQ(before, after);
}
};
@@ -47,11 +54,11 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
content::RenderViewHost* rvh =
chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"", L"window.before = window.chrome.loadTimes()"));
+ rvh, "", "window.before = window.chrome.loadTimes()"));
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"", L"window.location.href = window.location + \"#\""));
+ rvh, "", "window.location.href = window.location + \"#\""));
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"", L"window.after = window.chrome.loadTimes()"));
+ rvh, "", "window.after = window.chrome.loadTimes()"));
CompareBeforeAndAfter();
}
@@ -64,9 +71,9 @@ IN_PROC_BROWSER_TEST_F(LoadtimesExtensionBindingsTest,
content::RenderViewHost* rvh =
chrome::GetActiveWebContents(browser())->GetRenderViewHost();
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"", L"window.before = window.chrome.loadTimes()"));
+ rvh, "", "window.before = window.chrome.loadTimes()"));
ui_test_utils::NavigateToURL(browser(), hash_url);
ASSERT_TRUE(content::ExecuteJavaScript(
- rvh, L"", L"window.after = window.chrome.loadTimes()"));
+ rvh, "", "window.after = window.chrome.loadTimes()"));
CompareBeforeAndAfter();
}
« no previous file with comments | « chrome/browser/instant/instant_browsertest.cc ('k') | chrome/browser/net/load_timing_observer_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698