Rename CommandLine::GetCommandLineString().

chrome/installer/util/product.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/installer/util/product.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 62 matching lines @@
                                   int32* exit_code) const {
   if (application_path.empty())
     return false;
 
   CommandLine cmd(application_path.Append(installer::kChromeExe));
   cmd.AppendArguments(options, false);
 
   bool success = false;
   STARTUPINFOW si = { sizeof(si) };
   PROCESS_INFORMATION pi = {0};
-  // Cast away constness of the command_line_string() since CreateProcess
+  // Cast away constness of the GetCommandLineString() since CreateProcess
   // might modify the string (insert \0 to separate the program from the
   // arguments).  Since we're not using the cmd variable beyond this point
   // we don't care.

[Evan Martin, 2011/07/15 21:05:16]

This feels pretty dangerous to me; for example, the PLOG() below will do the
wrong thing depending on whether we're reusing a member or not.  Sigh.

[msw, 2011/07/18 20:59:33]

Yeah, this isn't a good practice. I changed this and base/process_util_win.cc to
follow the pattern used in sandbox/src/Wow64.cc; please consider.

   if (!::CreateProcess(cmd.GetProgram().value().c_str(),
-                       const_cast<wchar_t*>(cmd.command_line_string().c_str()),
+                       const_cast<wchar_t*>(cmd.GetCommandLineString().c_str()),
                        NULL, NULL, FALSE, CREATE_NO_WINDOW, NULL, NULL,
                        &si, &pi)) {
-    PLOG(ERROR) << "Failed to launch: " << cmd.command_line_string();
+    PLOG(ERROR) << "Failed to launch: " << cmd.GetCommandLineString();
   } else {
     ::CloseHandle(pi.hThread);
 
     DWORD ret = ::WaitForSingleObject(pi.hProcess, INFINITE);
     DLOG_IF(ERROR, ret != WAIT_OBJECT_0)
         << "Unexpected return value from WaitForSingleObject: " << ret;
     if (::GetExitCodeProcess(pi.hProcess, &ret)) {
       DCHECK(ret != STILL_ACTIVE);
       success = true;
       if (exit_code)
@@ skipping 42 matching lines @@
 
 void Product::AppendRenameFlags(CommandLine* command_line) const {
   operations_->AppendRenameFlags(options_, command_line);
 }
 
 bool Product::SetChannelFlags(bool set, ChannelInfo* channel_info) const {
   return operations_->SetChannelFlags(options_, set, channel_info);
 }
 
 }  // namespace installer