Make callers of CommandLine use it via the base:: namespace, and remove the global alias.
BUG=422426
TEST=none
[email protected]
Review URL: https://codereview.chromium.org/812353003
Cr-Commit-Position: refs/heads/master@{#309644}
diff --git a/chrome/common/logging_chrome.cc b/chrome/common/logging_chrome.cc
index 67569e27..04ad0e3e9 100644
--- a/chrome/common/logging_chrome.cc
+++ b/chrome/common/logging_chrome.cc
@@ -117,7 +117,7 @@
namespace logging {
-LoggingDestination DetermineLogMode(const CommandLine& command_line) {
+LoggingDestination DetermineLogMode(const base::CommandLine& command_line) {
// only use OutputDebugString in debug mode
#ifdef NDEBUG
bool enable_logging = false;
@@ -187,7 +187,7 @@
} // anonymous namespace
-base::FilePath GetSessionLogDir(const CommandLine& command_line) {
+base::FilePath GetSessionLogDir(const base::CommandLine& command_line) {
base::FilePath log_dir;
std::string log_dir_str;
scoped_ptr<base::Environment> env(base::Environment::Create());
@@ -213,11 +213,11 @@
return log_dir;
}
-base::FilePath GetSessionLogFile(const CommandLine& command_line) {
+base::FilePath GetSessionLogFile(const base::CommandLine& command_line) {
return GetSessionLogDir(command_line).Append(GetLogFileName().BaseName());
}
-void RedirectChromeLogging(const CommandLine& command_line) {
+void RedirectChromeLogging(const base::CommandLine& command_line) {
if (chrome_logging_redirected_) {
// TODO(nkostylev): Support multiple active users. http://crbug.com/230345
LOG(WARNING) << "NOT redirecting logging for multi-profiles case.";
@@ -252,7 +252,7 @@
#endif // OS_CHROMEOS
-void InitChromeLogging(const CommandLine& command_line,
+void InitChromeLogging(const base::CommandLine& command_line,
OldFileDeletionState delete_old_log_file) {
DCHECK(!chrome_logging_initialized_) <<
"Attempted to initialize logging when it was already initialized.";
@@ -315,7 +315,8 @@
#endif
// Default to showing error dialogs.
- if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoErrorDialogs))
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kNoErrorDialogs))
logging::SetShowErrorDialogs(true);
// we want process and thread IDs because we have a lot of things running
