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

Unified Diff: content/public/test/browser_test_utils.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | content/public/test/fake_speech_recognition_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_utils.cc
diff --git a/content/public/test/browser_test_utils.cc b/content/public/test/browser_test_utils.cc
index 29252b3d393ee969040c70dfc776e1d3a9a75c1a..a7d8c78fcadb3b098013243de2cc26fdec622bd2 100644
--- a/content/public/test/browser_test_utils.cc
+++ b/content/public/test/browser_test_utils.cc
@@ -96,8 +96,8 @@ bool ExecuteScriptHelper(RenderViewHost* render_view_host,
std::string script =
"window.domAutomationController.setAutomationId(0);" + original_script;
DOMOperationObserver dom_op_observer(render_view_host);
- render_view_host->ExecuteJavascriptInWebFrame(UTF8ToUTF16(frame_xpath),
- UTF8ToUTF16(script));
+ render_view_host->ExecuteJavascriptInWebFrame(base::UTF8ToUTF16(frame_xpath),
+ base::UTF8ToUTF16(script));
std::string json;
if (!dom_op_observer.WaitAndGetResponse(&json)) {
DLOG(ERROR) << "Cannot communicate with DOMOperationObserver.";
« no previous file with comments | « content/public/common/webplugininfo.cc ('k') | content/public/test/fake_speech_recognition_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698