base/ header cleanup. Forward declaration instead of including.

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.
 
 // 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_
 #pragma once
 
 #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 FilePath;
 class InProcessBrowserTest;
 
 class CommandLine {
  public:
   // A constructor for CommandLines that are used only to carry arguments.
   enum ArgumentsOnly { ARGUMENTS_ONLY };
   explicit CommandLine(ArgumentsOnly args_only);
   ~CommandLine();
 
 #if defined(OS_WIN)
   // The type of native command line arguments.
   typedef std::wstring StringType;
 
   // 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);
-  static CommandLine FromString(const std::wstring& command_line) {
-    CommandLine cmd;
-    cmd.ParseFromString(command_line);
-    return cmd;
-  }
+  static CommandLine FromString(const std::wstring& command_line);
 #elif defined(OS_POSIX)
   // The type of native command line arguments.
   typedef std::string StringType;
 
   // Initialize from an argv vector.
   void InitFromArgv(int argc, const char* const* argv);
   void InitFromArgv(const std::vector<std::string>& argv);
 
-  CommandLine(int argc, const char* const* argv) {
-    InitFromArgv(argc, argv);
-  }
-  explicit CommandLine(const std::vector<std::string>& argv) {
-    InitFromArgv(argv);
-  }
+  CommandLine(int argc, const char* const* argv);
+  explicit CommandLine(const std::vector<std::string>& argv);
 #endif
 
   // Construct a new, empty command line.
   // |program| is the name of the program to run (aka argv[0]).
   explicit CommandLine(const FilePath& program);
 
   // Initialize the current process CommandLine singleton.  On Windows,
   // ignores its arguments (we instead parse GetCommandLineW()
   // directly) because we don't trust the CRT's parsing of the command
   // line, but it still must be called to set up the command line.
@@ skipping 22 matching lines @@
   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::string& switch_string) const;
 
   // Deprecated version of the above.
-  bool HasSwitch(const std::wstring& switch_string) const {
-    return HasSwitch(WideToASCII(switch_string));
-  }
+  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 {
-    return WideToASCII(GetSwitchValue(switch_string));
-  }
-  FilePath GetSwitchValuePath(const std::string& switch_string) const {
-    return FilePath::FromWStringHack(GetSwitchValue(switch_string));
-  }
+  std::string GetSwitchValueASCII(const std::string& switch_string) const;
+  FilePath GetSwitchValuePath(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 {
-    return GetSwitchValue(WideToASCII(switch_string));
-  }
+  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;
 
   // Get a copy of all switches, along with their values
-  SwitchMap GetSwitches() const {
+  const SwitchMap& GetSwitches() const {
     return switches_;
   }
 
   // Get the remaining arguments to the command.
   const std::vector<StringType>& args() const { return args_; }
 
 #if defined(OS_WIN)
   // Returns the original command line string.
   const std::wstring& command_line_string() const {
     return command_line_string_;
   }
 #elif defined(OS_POSIX)
   // Returns the original command line string as a vector of strings.
   const std::vector<std::string>& argv() const {
     return argv_;
   }
   // Try to match the same result as command_line_string() would get you
   // on windows.
   std::string command_line_string() const;
 #endif
 
   // Returns the program part of the command line string (the first item).
-  FilePath GetProgram() const {
-    return FilePath::FromWStringHack(program());
-  }
+  FilePath GetProgram() const;
 
   // 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::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.
   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::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));
-  }
+                             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
@@ skipping 41 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_