| Index: base/command_line.cc
|
| ===================================================================
|
| --- base/command_line.cc (revision 65856)
|
| +++ base/command_line.cc (working copy)
|
| @@ -431,7 +431,16 @@
|
| // Verify include_program is used correctly.
|
| // Logic could be shorter but this is clearer.
|
| DCHECK_EQ(include_program, !other.GetProgram().empty());
|
| - command_line_string_ += L" " + other.command_line_string_;
|
| + if (include_program) {
|
| + DCHECK(program_.empty());
|
| + program_ = other.program_;
|
| + }
|
| +
|
| + if (!command_line_string_.empty())
|
| + command_line_string_ += L' ';
|
| +
|
| + command_line_string_ += other.command_line_string_;
|
| +
|
| std::map<std::string, StringType>::const_iterator i;
|
| for (i = other.switches_.begin(); i != other.switches_.end(); ++i)
|
| switches_[i->first] = i->second;
|
|
|