| Index: chrome/browser/loadtimes_extension_bindings_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/loadtimes_extension_bindings_browsertest.cc (revision 174946)
|
| +++ chrome/browser/loadtimes_extension_bindings_browsertest.cc (working copy)
|
| @@ -21,27 +21,20 @@
|
| content::RenderViewHost* rvh =
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost();
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh,
|
| - "",
|
| - "window.before.firstPaintAfterLoadTime = 0;"
|
| - "window.before.firstPaintTime = 0;"
|
| - "window.after.firstPaintAfterLoadTime = 0;"
|
| - "window.after.firstPaintTime = 0;"));
|
| + rvh, L"",
|
| + L"window.before.firstPaintAfterLoadTime = 0;"
|
| + L"window.before.firstPaintTime = 0;"
|
| + L"window.after.firstPaintAfterLoadTime = 0;"
|
| + L"window.after.firstPaintTime = 0;"));
|
|
|
| std::string before;
|
| std::string after;
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| - rvh,
|
| - "",
|
| - "window.domAutomationController.send("
|
| - " JSON.stringify(before))",
|
| - &before));
|
| + rvh, L"", L"window.domAutomationController.send("
|
| + L"JSON.stringify(before))", &before));
|
| ASSERT_TRUE(content::ExecuteJavaScriptAndExtractString(
|
| - rvh,
|
| - "",
|
| - "window.domAutomationController.send("
|
| - " JSON.stringify(after))",
|
| - &after));
|
| + rvh, L"", L"window.domAutomationController.send("
|
| + L"JSON.stringify(after))", &after));
|
| EXPECT_EQ(before, after);
|
| }
|
| };
|
| @@ -54,11 +47,11 @@
|
| content::RenderViewHost* rvh =
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost();
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh, "", "window.before = window.chrome.loadTimes()"));
|
| + rvh, L"", L"window.before = window.chrome.loadTimes()"));
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh, "", "window.location.href = window.location + \"#\""));
|
| + rvh, L"", L"window.location.href = window.location + \"#\""));
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh, "", "window.after = window.chrome.loadTimes()"));
|
| + rvh, L"", L"window.after = window.chrome.loadTimes()"));
|
| CompareBeforeAndAfter();
|
| }
|
|
|
| @@ -71,9 +64,9 @@
|
| content::RenderViewHost* rvh =
|
| chrome::GetActiveWebContents(browser())->GetRenderViewHost();
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh, "", "window.before = window.chrome.loadTimes()"));
|
| + rvh, L"", L"window.before = window.chrome.loadTimes()"));
|
| ui_test_utils::NavigateToURL(browser(), hash_url);
|
| ASSERT_TRUE(content::ExecuteJavaScript(
|
| - rvh, "", "window.after = window.chrome.loadTimes()"));
|
| + rvh, L"", L"window.after = window.chrome.loadTimes()"));
|
| CompareBeforeAndAfter();
|
| }
|
|
|