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

Unified Diff: chrome/browser/geolocation/geolocation_browsertest.cc

Issue 6312154: Remove wstring from RVH's run Javascript command.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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/geolocation/geolocation_browsertest.cc
===================================================================
--- chrome/browser/geolocation/geolocation_browsertest.cc (revision 73855)
+++ chrome/browser/geolocation/geolocation_browsertest.cc (working copy)
@@ -51,7 +51,7 @@
iframe_id,
url.spec().c_str());
browser->GetSelectedTabContents()->render_view_host()->
- ExecuteJavascriptInWebFrame(L"", UTF8ToWide(script));
+ ExecuteJavascriptInWebFrame(string16(), UTF8ToUTF16(script));
ui_test_utils::RunMessageLoop();
EXPECT_EQ(StringPrintf("\"%d\"", iframe_id), javascript_response_);
@@ -130,8 +130,8 @@
std::string script =
"window.domAutomationController.setAutomationId(0);"
"window.domAutomationController.send(geoStart());";
- render_view_host->ExecuteJavascriptInWebFrame(iframe_xpath,
- UTF8ToWide(script));
+ render_view_host->ExecuteJavascriptInWebFrame(WideToUTF16Hack(iframe_xpath),
+ UTF8ToUTF16(script));
ui_test_utils::RunMessageLoop();
registrar_.RemoveAll();
LOG(WARNING) << "got geolocation watch" << javascript_response_;

Powered by Google App Engine
This is Rietveld 408576698