CommandLine: remove PrefixedSwitchString().

base/command_line.cc

 // Copyright (c) 2010 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"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #elif defined(OS_POSIX)
@@ skipping 334 matching lines @@
   return base::SysNativeMBToWide(argv_[0]);
 }
 #endif
 
 #if defined(OS_POSIX)
 std::string CommandLine::command_line_string() const {
   return JoinString(argv_, ' ');
 }
 #endif
 
-// static
-std::wstring CommandLine::PrefixedSwitchString(
-    const std::string& switch_string) {
-#if defined(OS_WIN)
-  return kSwitchPrefixes[0] + ASCIIToWide(switch_string);
-#else
-  return ASCIIToWide(kSwitchPrefixes[0] + switch_string);
-#endif
-}
-
-// static
-std::wstring CommandLine::PrefixedSwitchStringWithValue(
-    const std::string& switch_string, const std::wstring& value_string) {
-  if (value_string.empty()) {
-    return PrefixedSwitchString(switch_string);
-  }
-
-  return PrefixedSwitchString(switch_string +
-#if defined(OS_WIN)
-                              WideToASCII(kSwitchValueSeparator)
-#else
-                              kSwitchValueSeparator
-#endif
-                              ) + value_string;
-}
-
 #if defined(OS_WIN)
 void CommandLine::AppendSwitch(const std::string& switch_string) {
-  std::wstring prefixed_switch_string = PrefixedSwitchString(switch_string);
   command_line_string_.append(L" ");
-  command_line_string_.append(prefixed_switch_string);
+  command_line_string_.append(kSwitchPrefixes[0] + ASCIIToWide(switch_string));
   switches_[switch_string] = L"";
 }
 
 void CommandLine::AppendSwitchASCII(const std::string& switch_string,
                                     const std::string& value_string) {
   AppendSwitchNative(switch_string, ASCIIToWide(value_string));
 }
 
 void CommandLine::AppendSwitchNative(const std::string& switch_string,
                                      const std::wstring& value_string) {
   std::wstring value_string_edit;
 
   // NOTE(jhughes): If the value contains a quotation mark at one
   //                end but not both, you may get unusable output.
   if (!value_string.empty() &&
       (value_string.find(L" ") != std::wstring::npos) &&
       (value_string[0] != L'"') &&
       (value_string[value_string.length() - 1] != L'"')) {
     // need to provide quotes
     value_string_edit = StringPrintf(L"\"%ls\"", value_string.c_str());
   } else {
     value_string_edit = value_string;
   }
 
   std::wstring combined_switch_string =
-      PrefixedSwitchStringWithValue(switch_string, value_string_edit);
+      kSwitchPrefixes[0] + ASCIIToWide(switch_string);
+  if (!value_string_edit.empty())
+    combined_switch_string += kSwitchValueSeparator + value_string_edit;
 
   command_line_string_.append(L" ");
   command_line_string_.append(combined_switch_string);
 
   switches_[switch_string] = value_string;
 }
 
 void CommandLine::AppendLooseValue(const std::wstring& value) {
   // TODO(evan): quoting?
   command_line_string_.append(L" ");
@@ skipping 24 matching lines @@
 }
 
 #elif defined(OS_POSIX)
 void CommandLine::AppendSwitch(const std::string& switch_string) {
   argv_.push_back(kSwitchPrefixes[0] + switch_string);
   switches_[switch_string] = "";
 }
 
 void CommandLine::AppendSwitchNative(const std::string& switch_string,
                                      const std::string& value) {
-  argv_.push_back(kSwitchPrefixes[0] + switch_string +
-                  kSwitchValueSeparator + value);
+  std::string combined_switch_string = kSwitchPrefixes[0] + switch_string;
+  if (!value.empty())
+    combined_switch_string += kSwitchValueSeparator + value;
+  argv_.push_back(combined_switch_string);
   switches_[switch_string] = value;
 }
 
 void CommandLine::AppendSwitchASCII(const std::string& switch_string,
                                     const std::string& value_string) {
   AppendSwitchNative(switch_string, value_string);
 }
 
 void CommandLine::AppendLooseValue(const std::wstring& value) {
   argv_.push_back(base::SysWideToNativeMB(value));
@@ skipping 34 matching lines @@
     if (source.HasSwitch(switches[i])) {
       StringType value = source.GetSwitchValueNative(switches[i]);
       AppendSwitchNative(switches[i], value);
     }
   }
 }
 
 // private
 CommandLine::CommandLine() {
 }