Use ASCII strings for switch names.

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 considered "loose parameters".  Switch names are
 // case-insensitive.  An argument of "--" will terminate switch
 // parsing, causing everything after to be considered as loose
 // parameters.
 
 // There is a singleton read-only CommandLine that represents the command
 // line that the current process was started with.  It must be initialized
 // in main() (or whatever the platform's equivalent function is).
 
 #ifndef BASE_COMMAND_LINE_H_
 #define BASE_COMMAND_LINE_H_
 
 #include "build/build_config.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/logging.h"
+#include "base/string_util.h"
 
 class InProcessBrowserTest;
 
 class CommandLine {
  public:
 #if defined(OS_WIN)
   // Initialize by parsing the given command-line string.
   // The program name is assumed to be the first item in the string.
   void ParseFromString(const std::wstring& command_line);
 #elif defined(OS_POSIX)
@@ skipping 42 matching lines @@
   // Get the singleton CommandLine representing the current process's
   // command line.  Note: returned value is mutable, but not thread safe;
   // only mutate if you know what you're doing!
   static CommandLine* ForCurrentProcess() {
     DCHECK(current_process_commandline_);
     return current_process_commandline_;
   }
 
   // Returns true if this command line contains the given switch.
   // (Switch names are case-insensitive.)
-  bool HasSwitch(const std::wstring& switch_string) const;
+  bool HasSwitch(const std::string& switch_string) const;
+
+  // Deprecated version of the above.
+  bool HasSwitch(const std::wstring& switch_string) const {
+    return HasSwitch(WideToASCII(switch_string));
+  }
 
   // Returns the value associated with the given switch.  If the
   // switch has no value or isn't present, this method returns
   // the empty string.
-  std::wstring GetSwitchValue(const std::wstring& switch_string) const;
+  std::wstring GetSwitchValue(const std::string& switch_string) const;
+  std::string GetSwitchValueASCII(const std::string& switch_string) const {
+    return WideToASCII(GetSwitchValue(switch_string));
+  }
+
+  // Deprecated version of the above.
+  std::wstring GetSwitchValue(const std::wstring& switch_string) const {
+    return GetSwitchValue(WideToASCII(switch_string));
+  }
 
   // Get the number of switches in this process.
   size_t GetSwitchCount() const { return switches_.size(); }
 
   // Get the remaining arguments to the command.
   // WARNING: this is incorrect on POSIX; we must do string conversions.
   std::vector<std::wstring> GetLooseValues() const;
 
 #if defined(OS_WIN)
   // Returns the original command line string.
@@ skipping 11 matching lines @@
   FilePath GetProgram() const {
     return FilePath::FromWStringHack(program());
   }
 
   // Returns the program part of the command line string (the first item).
   // Deprecated version of the above.
   std::wstring program() const;
 
   // Return a copy of the string prefixed with a switch prefix.
   // Used internally.
-  static std::wstring PrefixedSwitchString(const std::wstring& switch_string);
+  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::wstring& switch_string,
+                        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.
-  void AppendSwitch(const std::wstring& switch_string);
+  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.
-  void AppendSwitchWithValue(const std::wstring& switch_string,
+  void AppendSwitchWithValue(const std::string& switch_string,
                              const std::wstring& value_string);
+  void AppendSwitchWithValue(const std::string& switch_string,
+                             const std::string& value_string) {
+    AppendSwitchWithValue(switch_string, ASCIIToWide(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
@@ skipping 49 matching lines @@
   std::vector<StringType> loose_values_;
 
   // 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_