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

Unified Diff: chrome/test/ui/ppapi_uitest.cc

Issue 3012021: CommandLine: add a CopySwitchesFrom() for copying from another CommandLine (Closed)
Patch Set: minor cleanups Created 10 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
« no previous file with comments | « chrome/test/ui/npapi_test_helper.cc ('k') | chrome/test/ui/sandbox_uitests.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/ppapi_uitest.cc
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc
index a1b35d1fac3e6e8f5fc304bf56196f286e39d2e9..91444819bae433ee0b81b039aa5eae10ac15a810 100644
--- a/chrome/test/ui/ppapi_uitest.cc
+++ b/chrome/test/ui/ppapi_uitest.cc
@@ -36,15 +36,10 @@ class PPAPITest : public UITest {
FilePath plugin_lib = plugin_dir.Append(library_name);
EXPECT_TRUE(file_util::PathExists(plugin_lib));
-
-#if defined(OS_WIN)
- std::wstring pepper_plugin = plugin_lib.value();
-#else
- std::wstring pepper_plugin = UTF8ToWide(plugin_lib.value());
-#endif
- pepper_plugin.append(L";application/x-ppapi-tests");
- launch_arguments_.AppendSwitchWithValue(switches::kRegisterPepperPlugins,
- pepper_plugin);
+ FilePath::StringType pepper_plugin = plugin_lib.value();
+ pepper_plugin.append(FILE_PATH_LITERAL(";application/x-ppapi-tests"));
+ launch_arguments_.AppendSwitchNative(switches::kRegisterPepperPlugins,
+ pepper_plugin);
// The test sends us the result via a cookie.
launch_arguments_.AppendSwitch(switches::kEnableFileCookies);
« no previous file with comments | « chrome/test/ui/npapi_test_helper.cc ('k') | chrome/test/ui/sandbox_uitests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698