Rename CommandLine::GetCommandLineString().

base/process_util_win.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 "base/process_util.h"
 
 #include <fcntl.h>
 #include <io.h>
 #include <windows.h>
 #include <userenv.h>
@@ skipping 253 matching lines @@
     *process_handle = process_info.hProcess;
   } else {
     CloseHandle(process_info.hProcess);
   }
   return true;
 }
 
 bool LaunchProcess(const CommandLine& cmdline,
                    const LaunchOptions& options,
                    ProcessHandle* process_handle) {
-  return LaunchProcess(cmdline.command_line_string(), options, process_handle);
+  return LaunchProcess(cmdline.GetCommandLineString(), options, process_handle);
 }
 
 // Attempts to kill the process identified by the given process
 // entry structure, giving it the specified exit code.
 // Returns true if this is successful, false otherwise.
 bool KillProcessById(ProcessId process_id, int exit_code, bool wait) {
   HANDLE process = OpenProcess(PROCESS_TERMINATE | SYNCHRONIZE,
                                FALSE,  // Don't inherit handle
                                process_id);
   if (!process) {
@@ skipping 25 matching lines @@
   // Ensure we don't leak the handles.
   win::ScopedHandle scoped_out_read(out_read);
   win::ScopedHandle scoped_out_write(out_write);
 
   // Ensure the read handle to the pipe for STDOUT is not inherited.
   if (!SetHandleInformation(out_read, HANDLE_FLAG_INHERIT, 0)) {
     NOTREACHED() << "Failed to disabled pipe inheritance";
     return false;
   }
 
-  // Now create the child process
+  std::wstring writable_command_line_string(cl.GetCommandLineString());
+
   PROCESS_INFORMATION proc_info = { 0 };
   STARTUPINFO start_info = { 0 };
 
   start_info.cb = sizeof(STARTUPINFO);
   start_info.hStdOutput = out_write;
   // Keep the normal stdin and stderr.
   start_info.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
   start_info.hStdError = GetStdHandle(STD_ERROR_HANDLE);
   start_info.dwFlags |= STARTF_USESTDHANDLES;
 
   // Create the child process.
   if (!CreateProcess(NULL,
-                     const_cast<wchar_t*>(cl.command_line_string().c_str()),
+                     &writable_command_line_string[0],
                      NULL, NULL,
                      TRUE,  // Handles are inherited.
                      0, NULL, NULL, &start_info, &proc_info)) {
     NOTREACHED() << "Failed to start process";
     return false;
   }
 
   // We don't need the thread handle, close it now.
   CloseHandle(proc_info.hThread);
 
@@ skipping 522 matching lines @@
 
   PERFORMANCE_INFORMATION info;
   if (!InternalGetPerformanceInfo(&info, sizeof(info))) {
     LOG(ERROR) << "Failed to fetch internal performance info.";
     return 0;
   }
   return (info.CommitTotal * system_info.dwPageSize) / 1024;
 }
 
 }  // namespace base