Make callers of CommandLine use it via the base:: namespace.

chrome/browser/diagnostics/diagnostics_controller.cc

 // Copyright 2013 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 "chrome/browser/diagnostics/diagnostics_controller.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 40 matching lines @@
   // we have a common denominator.
   for (int i = 0; i < DIAGNOSTICS_TEST_ID_COUNT; ++i) {
     RecordUMARecoveryResult(static_cast<DiagnosticsTestId>(i), RESULT_NOT_RUN);
     RecordUMATestResult(static_cast<DiagnosticsTestId>(i), RESULT_NOT_RUN);
   }
 #endif
 }
 
 // This entry point is called from early in startup when very few things have
 // been initialized, so be careful what you use.
-int DiagnosticsController::Run(const CommandLine& command_line,
+int DiagnosticsController::Run(const base::CommandLine& command_line,
                                DiagnosticsWriter* writer) {
   writer_ = writer;
 
   model_.reset(MakeDiagnosticsModel(command_line));
   model_->RunAll(writer_);
 
   return 0;
 }
 
 // This entry point is called from early in startup when very few things have
 // been initialized, so be careful what you use.
-int DiagnosticsController::RunRecovery(const CommandLine& command_line,
+int DiagnosticsController::RunRecovery(const base::CommandLine& command_line,
                                        DiagnosticsWriter* writer) {
 // Separate out recoveries that we execute automatically as a result of a
 // crash from user-run recoveries.
 #if defined(OS_CHROMEOS)  // Only collecting UMA stats on ChromeOS
   if (command_line.HasSwitch(chromeos::switches::kLoginUser)) {
     UMA_HISTOGRAM_ENUMERATION("Diagnostics.RecoveryRun",
                               diagnostics::RECOVERY_CRASH_RUN,
                               diagnostics::RECOVERY_RUN_METRICS_COUNT);
   } else {
     UMA_HISTOGRAM_ENUMERATION("Diagnostics.RecoveryRun",
@@ skipping 10 matching lines @@
     return -1;
   }
 
   writer_ = writer;
 
   model_->RecoverAll(writer_);
   return 0;
 }
 
 }  // namespace diagnostics