CommandLine refactoring and cleanup.

chrome/test/live_sync/live_sync_test.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/live_sync/live_sync_test.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 363 matching lines @@
     cl->AppendSwitch(switches::kSyncAllowInsecureXmppConnection);
   }
 
   return true;
 }
 
 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(" ");
+  std::vector<CommandLine::StringType> server_cmdline_vector;
+  CommandLine::StringType delimiters(FILE_PATH_LITERAL(" "));
   Tokenize(server_cmdline_string, delimiters, &server_cmdline_vector);
   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.";
 
   const int kMaxWaitTime = TestTimeouts::live_operation_timeout_ms();
   const int kNumIntervals = 15;
   if (WaitForTestServerToStart(kMaxWaitTime, kNumIntervals)) {
     VLOG(1) << "Started local test server at "
             << cl->GetSwitchValueASCII(switches::kSyncServiceURL) << ".";
     return true;
   } else {
@@ skipping 68 matching lines @@
                                   const net::ProxyConfig& proxy_config) {
   base::WaitableEvent done(false, false);
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       new SetProxyConfigTask(&done,
                              context_getter,
                              proxy_config));
   done.Wait();
 }