CommandLine: Deprecate a function on non-Windows.

Merge deprecated functions together.

TEST=compiles

Review URL: http://codereview.chromium.org/3029068

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55460 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 11 deletions

diff --git a/base/command_line.h b/base/command_line.h
index 331add9..ecfb1bd 100644
--- a/base/command_line.h
+++ b/base/command_line.h
@@ -95,9 +95,6 @@ class CommandLine {
   // (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.
@@ -105,10 +102,6 @@ class CommandLine {
   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(); }
 
@@ -141,10 +134,6 @@ class CommandLine {
   // Returns the program part of the command line string (the first item).
   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);
@@ -182,6 +171,16 @@ class CommandLine {
   void CopySwitchesFrom(const CommandLine& source, const char* const switches[],
                         size_t count);
 
+  // APIs that work with wstrings are deprecated.
+  // TODO(evanm): remove all of these.
+  std::wstring GetSwitchValue(const std::string& switch_string) const;
+  std::wstring GetSwitchValue(const std::wstring& switch_string) const;
+  std::wstring program() const;
+#if defined(OS_WIN)
+  // Deprecated on non-Windows.
+  bool HasSwitch(const std::wstring& switch_string) const;
+#endif
+
  private:
   friend class InProcessBrowserTest;