summaryrefslogtreecommitdiffstats
path: root/base/command_line.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 03:06:12 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-25 03:06:12 +0000
commit2f4a8e1220d91ba95c2c46ec232dd53d27807ecd (patch)
treea353800ca5728e7c26423af7cccedf9812404d9a /base/command_line.cc
parent27488c22fe34d431fa34576032d8a0fc92b61572 (diff)
downloadchromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.zip
chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.gz
chromium_src-2f4a8e1220d91ba95c2c46ec232dd53d27807ecd.tar.bz2
Revert 107042 - Replace most LOG/CHECK statements with DLOG/DCHECK statements in base.
I tried hard not to change CHECKs that had side effects. I kept fatal checks that seemed security or debugging-info (in crash reports) sensitive, and ones that seems particularly well-conceived. Review URL: http://codereview.chromium.org/8368009 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8351025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107051 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/command_line.cc')
-rw-r--r--base/command_line.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/base/command_line.cc b/base/command_line.cc
index 0237ffe..22977af 100644
--- a/base/command_line.cc
+++ b/base/command_line.cc
@@ -268,8 +268,8 @@ std::string CommandLine::GetSwitchValueASCII(
const std::string& switch_string) const {
StringType value = GetSwitchValueNative(switch_string);
if (!IsStringASCII(value)) {
- DLOG(WARNING) << "Value of switch (" << switch_string << ") must be ASCII.";
- return std::string();
+ LOG(WARNING) << "Value of switch (" << switch_string << ") must be ASCII.";
+ return "";
}
#if defined(OS_WIN)
return WideToASCII(value);
@@ -394,8 +394,8 @@ void CommandLine::ParseFromString(const std::wstring& command_line) {
wchar_t** args = NULL;
args = ::CommandLineToArgvW(command_line_string.c_str(), &num_args);
- DPLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: "
- << command_line;
+ PLOG_IF(FATAL, !args) << "CommandLineToArgvW failed on command line: " <<
+ command_line;
InitFromArgv(num_args, args);
LocalFree(args);
}