diff options
| -rw-r--r-- | base/command_line.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/base/command_line.cc b/base/command_line.cc index 53859d6..bc4e1a0 100644 --- a/base/command_line.cc +++ b/base/command_line.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// 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. @@ -374,7 +374,7 @@ void CommandLine::AppendArguments(const CommandLine& other, bool include_program) { // Verify include_program is used correctly. // Logic could be shorter but this is clearer. - DCHECK(include_program ? !other.program().empty() : other.program().empty()); + DCHECK_EQ(include_program, !other.GetProgram().empty()); command_line_string_ += L" " + other.command_line_string_; std::map<std::string, StringType>::const_iterator i; for (i = other.switches_.begin(); i != other.switches_.end(); ++i) @@ -413,8 +413,7 @@ void CommandLine::AppendArguments(const CommandLine& other, bool include_program) { // Verify include_program is used correctly. // Logic could be shorter but this is clearer. - DCHECK(include_program ? !other.program().empty() : other.program().empty()); - + DCHECK_EQ(include_program, !other.GetProgram().empty()); size_t first_arg = include_program ? 0 : 1; for (size_t i = first_arg; i < other.argv_.size(); ++i) argv_.push_back(other.argv_[i]); |