Index: chrome/test/live_sync/live_sync_test.cc |
diff --git a/chrome/test/live_sync/live_sync_test.cc b/chrome/test/live_sync/live_sync_test.cc |
index b22cc030d814b4b3371a46ab920b2a0a3e6b14ab..4acdbccc2ef848756ac462ee95e0ff163b898d07 100644 |
--- a/chrome/test/live_sync/live_sync_test.cc |
+++ b/chrome/test/live_sync/live_sync_test.cc |
@@ -403,14 +403,10 @@ bool LiveSyncTest::SetUpLocalTestServer() { |
CommandLine* cl = CommandLine::ForCurrentProcess(); |
CommandLine::StringType server_cmdline_string = cl->GetSwitchValueNative( |
switches::kSyncServerCommandLine); |
-#if defined(OS_WIN) |
- CommandLine server_cmdline = CommandLine::FromString(server_cmdline_string); |
-#else |
- std::vector<std::string> server_cmdline_vector; |
- std::string delimiters(" "); |
+ CommandLine::StringVector server_cmdline_vector; |
+ CommandLine::StringType delimiters(FILE_PATH_LITERAL(" ")); |
Tokenize(server_cmdline_string, delimiters, &server_cmdline_vector); |
Evan Martin
2011/05/10 23:48:32
I wonder what this function is doing? It seems li
msw
2011/05/11 02:28:12
Hmm, it appears this parent process uses its kSync
|
CommandLine server_cmdline(server_cmdline_vector); |
-#endif |
if (!base::LaunchApp(server_cmdline, false, true, &test_server_handle_)) |
LOG(ERROR) << "Could not launch local test server."; |