Extract arguments reconstruction logic out of GetCommandLineString() into GetArgumentsString().

base/command_line.cc

 // Copyright (c) 2012 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/command_line.h"
 
 #include <algorithm>
 #include <ostream>
 
 #include "base/basictypes.h"
@@ skipping 210 matching lines @@
   begin_args_ = 1;
   SetProgram(argv.empty() ? FilePath() : FilePath(argv[0]));
   AppendSwitchesAndArguments(*this, argv);
 }
 
 CommandLine::StringType CommandLine::GetCommandLineString() const {
   StringType string(argv_[0]);
 #if defined(OS_WIN)
   string = QuoteForCommandLineToArgvW(string);
 #endif
+  StringType params(GetArgumentsString());
+  if (!params.empty()) {
+    string.append(StringType(FILE_PATH_LITERAL(" ")));
+    string.append(params);
+  }
+  return string;
+}
+
+CommandLine::StringType CommandLine::GetArgumentsString() const {
+  StringType params;
   // Append switches and arguments.
   bool parse_switches = true;
   for (size_t i = 1; i < argv_.size(); ++i) {
-    CommandLine::StringType arg = argv_[i];
-    CommandLine::StringType switch_string;
-    CommandLine::StringType switch_value;
+    StringType arg = argv_[i];
+    StringType switch_string;
+    StringType switch_value;
     parse_switches &= arg != kSwitchTerminator;
-    string.append(StringType(FILE_PATH_LITERAL(" ")));
+    if (i > 1)
+      params.append(StringType(FILE_PATH_LITERAL(" ")));
     if (parse_switches && IsSwitch(arg, &switch_string, &switch_value)) {
-      string.append(switch_string);
+      params.append(switch_string);
       if (!switch_value.empty()) {
 #if defined(OS_WIN)
         switch_value = QuoteForCommandLineToArgvW(switch_value);
 #endif
-        string.append(kSwitchValueSeparator + switch_value);
+        params.append(kSwitchValueSeparator + switch_value);
       }
     }
     else {
 #if defined(OS_WIN)
       arg = QuoteForCommandLineToArgvW(arg);
 #endif
-      string.append(arg);
+      params.append(arg);
     }
   }
-  return string;
+  return params;
 }
 
 FilePath CommandLine::GetProgram() const {
   return FilePath(argv_[0]);
 }
 
 void CommandLine::SetProgram(const FilePath& program) {
   TrimWhitespace(program.value(), TRIM_ALL, &argv_[0]);
 }
 
@@ skipping 130 matching lines @@
   int num_args = 0;
   wchar_t** args = NULL;
   args = ::CommandLineToArgvW(command_line_string.c_str(), &num_args);
 
   DPLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: "
                          << command_line;
   InitFromArgv(num_args, args);
   LocalFree(args);
 }
 #endif