Add a unit test for CommandLine that makes sure that GetProgram will not retu...

base/command_line.cc

 // Copyright (c) 2010 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.
 
 #include "base/command_line.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #elif defined(OS_POSIX)
@@ skipping 28 matching lines @@
 const wchar_t* const kSwitchPrefixes[] = {L"--", L"-", L"/"};
 const wchar_t kSwitchTerminator[] = L"--";
 const wchar_t kSwitchValueSeparator[] = L"=";
 #elif defined(OS_POSIX)
 // Unixes don't use slash as a switch.
 const char* const kSwitchPrefixes[] = {"--", "-"};
 const char kSwitchTerminator[] = "--";
 const char kSwitchValueSeparator[] = "=";
 #endif
 
+namespace {
+
+// Trims the quotes from the beginning and end of a path.

[Mark Mentovai, 2010/11/15 22:01:22]

This should be Windows-specific. Put the function itself inside an #if to avoid
tempting people to use it on non-Windows. Having a program interpret quoting
like this at the command-line level is ludicrous on POSIX.

+CommandLine::StringType TrimQuotes(const FilePath::StringType& path) {
+  if (!path.empty() && path[0] == '"' && path[path.length() - 1] == '"')
+    return path.substr(1, path.length() - 2);
+  return path;
+}
+
+}  // end namespace
+
 #if defined(OS_WIN)
 // Lowercase a string.  This is used to lowercase switch names.
 // Is this what we really want?  It seems crazy to me.  I've left it in
 // for backwards compatibility on Windows.
 static void Lowercase(std::string* parameter) {
   transform(parameter->begin(), parameter->end(), parameter->begin(),
             tolower);
 }
 #endif
 
@@ skipping 48 matching lines @@
 
 // static
 CommandLine CommandLine::FromString(const std::wstring& command_line) {
   CommandLine cmd;
   cmd.ParseFromString(command_line);
   return cmd;
 }
 
 CommandLine::CommandLine(const FilePath& program) {
   if (!program.empty()) {
-    program_ = program.value();
+    program_ = TrimQuotes(program.value());
     // TODO(evanm): proper quoting here.
-    command_line_string_ = L'"' + program.value() + L'"';
+    command_line_string_ = L'"' + program_ + L'"';
   }
 }
 
 #elif defined(OS_POSIX)
 CommandLine::CommandLine(NoProgram no_program) {
   // Push an empty argument, because we always assume argv_[0] is a program.
   argv_.push_back("");
 }
 
 CommandLine::CommandLine(int argc, const char* const* argv) {
@@ skipping 30 matching lines @@
     std::string switch_value;
     if (IsSwitch(arg, &switch_string, &switch_value)) {
       switches_[switch_string] = switch_value;
     } else {
       args_.push_back(arg);
     }
   }
 }
 
 CommandLine::CommandLine(const FilePath& program) {
-  argv_.push_back(program.value());
+  argv_.push_back(TrimQuotes(program.value()));
 }
 
 #endif
 
 // static
 bool CommandLine::IsSwitch(const StringType& parameter_string,
                            std::string* switch_string,
                            StringType* switch_value) {
   switch_string->clear();
   switch_value->clear();
@@ skipping 354 matching lines @@
 
 // private
 CommandLine::CommandLine() {
 }
 
 // static
 CommandLine* CommandLine::ForCurrentProcessMutable() {
   DCHECK(current_process_commandline_);
   return current_process_commandline_;
 }