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

Unified Diff: content/browser/loader/resource_dispatcher_host_browsertest.cc

Issue 11734018: Revert 174880 due to compilation error in pdf_browsertest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1374/src/
Patch Set: 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: content/browser/loader/resource_dispatcher_host_browsertest.cc
===================================================================
--- content/browser/loader/resource_dispatcher_host_browsertest.cc (revision 174946)
+++ content/browser/loader/resource_dispatcher_host_browsertest.cc (working copy)
@@ -69,7 +69,7 @@
ShellAddedObserver new_shell_observer;
// Create dynamic popup.
- if (!ExecuteJavaScript(render_view_host(), "", "OpenPopup();"))
+ if (!ExecuteJavaScript(render_view_host(), L"", L"OpenPopup();"))
return false;
Shell* new_shell = new_shell_observer.GetShell();
@@ -167,8 +167,8 @@
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
shell()->web_contents()->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(DidSyncRequestSucceed());",
+ L"",
+ L"window.domAutomationController.send(DidSyncRequestSucceed());",
&success));
EXPECT_TRUE(success);
}
@@ -185,8 +185,8 @@
bool success = false;
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
shell()->web_contents()->GetRenderViewHost(),
- "",
- "window.domAutomationController.send(DidSucceed());",
+ L"",
+ L"window.domAutomationController.send(DidSucceed());",
&success));
EXPECT_TRUE(success);
}
@@ -348,9 +348,7 @@
"window.domAutomationController.send(true);";
EXPECT_TRUE(ExecuteJavaScriptAndExtractBool(
shell()->web_contents()->GetRenderViewHost(),
- "",
- redirect_script,
- &success));
+ L"", ASCIIToWide(redirect_script), &success));
EXPECT_EQ(expected_title16, title_watcher.WaitAndGetTitle());
}

Powered by Google App Engine
This is Rietveld 408576698