CommandLine: add a CopySwitchesFrom() for copying from another CommandLine

base/command_line.h

 // Copyright (c) 2006-2008 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.
 
 // This class works with command lines: building and parsing.
 // Switches can optionally have a value attached using an equals sign,
 // as in "-switch=value".  Arguments that aren't prefixed with a
 // switch prefix are saved as extra arguments.  An argument of "--"
 // will terminate switch parsing, causing everything after to be
 // considered as extra arguments.
@@ skipping 83 matching lines @@
   // Returns true if this command line contains the given switch.
   // (Switch names are case-insensitive.)
   bool HasSwitch(const std::string& switch_string) const;
 
   // Deprecated version of the above.
   bool HasSwitch(const std::wstring& switch_string) const;
 
   // Returns the value associated with the given switch.  If the
   // switch has no value or isn't present, this method returns
   // the empty string.
-  // TODO(evanm): move these into command_line.cpp once we've fixed the
-  // wstringness.
   std::string GetSwitchValueASCII(const std::string& switch_string) const;
   FilePath GetSwitchValuePath(const std::string& switch_string) const;
+  StringType GetSwitchValueNative(const std::string& switch_string) const;
 
   // Deprecated versions of the above.
   std::wstring GetSwitchValue(const std::string& switch_string) const;
   std::wstring GetSwitchValue(const std::wstring& switch_string) const;
 
   // Get the number of switches in this process.
   size_t GetSwitchCount() const { return switches_.size(); }
 
   // The type of map for parsed-out switch key and values.
   typedef std::map<std::string, StringType> SwitchMap;
@@ skipping 31 matching lines @@
   // Return a copy of the string prefixed with a switch prefix.
   // Used internally.
   static std::wstring PrefixedSwitchString(const std::string& switch_string);
 
   // Return a copy of the string prefixed with a switch prefix,
   // and appended with the given value. Used internally.
   static std::wstring PrefixedSwitchStringWithValue(
                         const std::string& switch_string,
                         const std::wstring& value_string);
 
-  // Appends the given switch string (preceded by a space and a switch
-  // prefix) to the given string.
+  // Append a switch to the command line.
   void AppendSwitch(const std::string& switch_string);
 
-  // Appends the given switch string (preceded by a space and a switch
-  // prefix) to the given string, with the given value attached.
+  // Append a switch and value to the command line.
+  void AppendSwitchPath(const std::string& switch_string, const FilePath& path);
+  void AppendSwitchNative(const std::string& switch_string,
+                          const StringType& value);
+
+  // Append a switch and value to the command line.
+  // TODO(evanm): remove all AppendSwitchWithValue() instances.
+  // TODO(evanm): add an *ASCII() version.
   void AppendSwitchWithValue(const std::string& switch_string,
                              const std::wstring& value_string);
   void AppendSwitchWithValue(const std::string& switch_string,
                              const std::string& value_string);
 
   // Append a loose value to the command line.
   void AppendLooseValue(const std::wstring& value);
 
   // Append the arguments from another command line to this one.
   // If |include_program| is true, include |other|'s program as well.
   void AppendArguments(const CommandLine& other,
                        bool include_program);
 
   // On POSIX systems it's common to run processes via a wrapper (like
   // "valgrind" or "gdb --args").
   void PrependWrapper(const std::wstring& wrapper);
 
+  // Copy a set of switches (and their values, if any) from another command
+  // line.  Commonly used when launching a subprocess.
+  void CopySwitchesFrom(const CommandLine& source, const char* const switches[],
+                        size_t count);
+
  private:
   friend class InProcessBrowserTest;
 
   CommandLine();
 
   // Used by InProcessBrowserTest.
   static CommandLine* ForCurrentProcessMutable() {
     DCHECK(current_process_commandline_);
     return current_process_commandline_;
   }
@@ skipping 28 matching lines @@
   std::vector<StringType> args_;
 
   // We allow copy constructors, because a common pattern is to grab a
   // copy of the current process's command line and then add some
   // flags to it.  E.g.:
   //   CommandLine cl(*CommandLine::ForCurrentProcess());
   //   cl.AppendSwitch(...);
 };
 
 #endif  // BASE_COMMAND_LINE_H_