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

Unified Diff: chrome/test/base/extension_js_browser_test.cc

Issue 1223153003: Move JoinString to the base namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: windows Created 5 years, 5 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/test/base/extension_js_browser_test.cc
diff --git a/chrome/test/base/extension_js_browser_test.cc b/chrome/test/base/extension_js_browser_test.cc
index b84d2231ecfbb203ef8823b403038995e25883ac..f6396d0d6d8bd4e966350ac25b82a078f2ac82dd 100644
--- a/chrome/test/base/extension_js_browser_test.cc
+++ b/chrome/test/base/extension_js_browser_test.cc
@@ -42,7 +42,8 @@ bool ExtensionJSBrowserTest::RunJavascriptTestF(bool is_async,
}
scripts.push_back(BuildRunTestJSCall(is_async, "RUN_TEST_F", args));
- base::string16 script_16 = JoinString(scripts, '\n');
+ base::string16 script_16 =
+ base::JoinString(scripts, base::ASCIIToUTF16("\n"));
std::string script = base::UTF16ToUTF8(script_16);
std::string result =
« no previous file with comments | « chrome/installer/setup/update_active_setup_version_work_item.cc ('k') | chrome/test/base/web_ui_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698