base::CommandLine: Replace use of wstring with string16.

base/command_line.h

 // 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.
 
 // This class works with command lines: building and parsing.
 // Arguments with prefixes ('--', '-', and on Windows, '/') are switches.
 // Switches will precede all other arguments without switch prefixes.
 // Switches can optionally have values, delimited by '=', e.g., "-switch=value".
 // An argument of "--" will terminate switch parsing during initialization,
 // interpreting subsequent tokens as non-switch arguments, regardless of prefix.
 
 // 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().
 
 #ifndef BASE_COMMAND_LINE_H_
 #define BASE_COMMAND_LINE_H_
 
 #include <stddef.h>
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/base_export.h"
+#include "base/strings/string16.h"
 #include "build/build_config.h"
 
 namespace base {
 
 class FilePath;
 
 class BASE_EXPORT CommandLine {
  public:
 #if defined(OS_WIN)
   // The native command line string type.
-  typedef std::wstring StringType;
+  typedef base::string16 StringType;
 #elif defined(OS_POSIX)
   typedef std::string StringType;
 #endif
 
   typedef StringType::value_type CharType;
   typedef std::vector<StringType> StringVector;
   typedef std::map<std::string, StringType> SwitchMap;
 
   // A constructor for CommandLines that only carry switches and arguments.
   enum NoProgram { NO_PROGRAM };
@@ skipping 35 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();
 
   // Returns true if the CommandLine has been initialized for the given process.
   static bool InitializedForCurrentProcess();
 
 #if defined(OS_WIN)
-  static CommandLine FromString(const std::wstring& command_line);
+  static CommandLine FromString(const base::string16& command_line);
 #endif
 
   // Initialize from an argv vector.
   void InitFromArgv(int argc, const CharType* const* argv);
   void InitFromArgv(const StringVector& argv);
 
   // Constructs and returns the represented command line string.
   // CAUTION! This should be avoided on POSIX because quoting behavior is
   // unclear.
   StringType GetCommandLineString() const;
@@ skipping 54 matching lines @@
   // If |include_program| is true, include |other|'s program as well.
   void AppendArguments(const CommandLine& other, bool include_program);
 
   // Insert a command before the current command.
   // Common for debuggers, like "valgrind" or "gdb --args".
   void PrependWrapper(const StringType& wrapper);
 
 #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);
+  void ParseFromString(const base::string16& command_line);
 #endif
 
  private:
   // Disallow default constructor; a program name must be explicitly specified.
   CommandLine();
   // Allow the copy constructor. A common pattern is to copy of the current
   // process's command line and then add some flags to it. For example:
   //   CommandLine cl(*CommandLine::ForCurrentProcess());
   //   cl.AppendSwitch(...);
 
   // The singleton CommandLine representing the current process's command line.
   static CommandLine* current_process_commandline_;
 
   // The argv array: { program, [(--|-|/)switch[=value]]*, [--], [argument]* }
   StringVector argv_;
 
   // Parsed-out switch keys and values.
   SwitchMap switches_;
 
   // The index after the program and switches, any arguments start here.
   size_t begin_args_;
 };
 
 }  // namespace base
 
 // TODO(brettw) remove once all callers specify the namespace properly.
 using base::CommandLine;
 
 #endif  // BASE_COMMAND_LINE_H_