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

tools/gn/setup.cc

 // Copyright (c) 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 "tools/gn/setup.h"
 
 #include <stdlib.h>
 
 #include <algorithm>
 #include <sstream>
@@ skipping 184 matching lines @@
       to_check = all_targets;
     }
 
     if (!commands::CheckPublicHeaders(&build_settings_, all_targets,
                                       to_check, false)) {
       return false;
     }
   }
 
   // Write out tracing and timing if requested.
-  const CommandLine* cmdline = CommandLine::ForCurrentProcess();
+  const base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   if (cmdline->HasSwitch(switches::kTime))
     PrintLongHelp(SummarizeTraces());
   if (cmdline->HasSwitch(switches::kTracelog))
     SaveTraces(cmdline->GetSwitchValuePath(switches::kTracelog));
 
   return true;
 }
 
 // Setup -----------------------------------------------------------------------
 
 Setup::Setup()
     : CommonSetup(),
       empty_settings_(&empty_build_settings_, std::string()),
       dotfile_scope_(&empty_settings_),
       fill_arguments_(true) {
   empty_settings_.set_toolchain_label(Label());
   build_settings_.set_item_defined_callback(
       base::Bind(&ItemDefinedCallback, scheduler_.main_loop(), builder_));
 
   // The scheduler's main loop wasn't created when the Loader was created, so
   // we need to set it now.
   loader_->set_main_loop(scheduler_.main_loop());
 }
 
 Setup::~Setup() {
 }
 
 bool Setup::DoSetup(const std::string& build_dir, bool force_create) {
-  CommandLine* cmdline = CommandLine::ForCurrentProcess();
+  base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
 
   scheduler_.set_verbose_logging(cmdline->HasSwitch(switches::kVerbose));
   if (cmdline->HasSwitch(switches::kTime) ||
       cmdline->HasSwitch(switches::kTracelog))
     EnableTracing();
 
   ScopedTrace setup_trace(TraceItem::TRACE_SETUP, "DoSetup");
 
   if (!FillSourceDir(*cmdline))
     return false;
@@ skipping 30 matching lines @@
 }
 
 Scheduler* Setup::GetScheduler() {
   return &scheduler_;
 }
 
 SourceFile Setup::GetBuildArgFile() const {
   return SourceFile(build_settings_.build_dir().value() + kBuildArgFileName);
 }
 
-bool Setup::FillArguments(const CommandLine& cmdline) {
+bool Setup::FillArguments(const base::CommandLine& cmdline) {
   // Use the args on the command line if specified, and save them. Do this even
   // if the list is empty (this means clear any defaults).
   if (cmdline.HasSwitch(switches::kArgs)) {
     if (!FillArgsFromCommandLine(cmdline.GetSwitchValueASCII(switches::kArgs)))
       return false;
     SaveArgsToFile();
     return true;
   }
 
   // No command line args given, use the arguments from the build dir (if any).
@@ skipping 94 matching lines @@
     return false;
   }
 
   // Add a dependency on the build arguments file. If this changes, we want
   // to re-generate the build.
   g_scheduler->AddGenDependency(build_arg_file);
 
   return true;
 }
 
-bool Setup::FillSourceDir(const CommandLine& cmdline) {
+bool Setup::FillSourceDir(const base::CommandLine& cmdline) {
   // Find the .gn file.
   base::FilePath root_path;
 
   // Prefer the command line args to the config file.
   base::FilePath relative_root_path =
       cmdline.GetSwitchValuePath(switches::kRoot);
   if (!relative_root_path.empty()) {
     root_path = base::MakeAbsoluteFilePath(relative_root_path);
     if (root_path.empty()) {
       Err(Location(), "Root source path not found.",
@@ skipping 124 matching lines @@
 
   dotfile_root_->AsBlock()->ExecuteBlockInScope(&dotfile_scope_, &err);
   if (err.has_error()) {
     err.PrintToStdout();
     return false;
   }
 
   return true;
 }
 
-bool Setup::FillOtherConfig(const CommandLine& cmdline) {
+bool Setup::FillOtherConfig(const base::CommandLine& cmdline) {
   Err err;
 
   // Secondary source path, read from the config file if present.
   // Read from the config file if present.
   const Value* secondary_value =
       dotfile_scope_.GetValue("secondary_source", true);
   if (secondary_value) {
     if (!secondary_value->VerifyTypeIs(Value::STRING, &err)) {
       err.PrintToStdout();
       return false;
@@ skipping 84 matching lines @@
 }
 
 void DependentSetup::RunPreMessageLoop() {
   CommonSetup::RunPreMessageLoop();
 }
 
 bool DependentSetup::RunPostMessageLoop() {
   return CommonSetup::RunPostMessageLoop();
 }