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

content/public/test/browser_test_base.cc

 // Copyright (c) 2011 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 "content/public/test/browser_test_base.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/stack_trace.h"
 #include "base/i18n/icu_util.h"
@@ skipping 150 matching lines @@
 
 BrowserTestBase::~BrowserTestBase() {
 #if defined(OS_ANDROID)
   // RemoteTestServer can cause wait on the UI thread.
   base::ThreadRestrictions::ScopedAllowWait allow_wait;
   test_server_.reset(NULL);
 #endif
 }
 
 void BrowserTestBase::SetUp() {
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 
   // Override the child process connection timeout since tests can exceed that
   // when sharded.
   command_line->AppendSwitchASCII(
       switches::kIPCConnectionTimeout,
       base::IntToString(TestTimeouts::action_max_timeout().InSeconds()));
 
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
@@ skipping 88 matching lines @@
 }
 
 void BrowserTestBase::ProxyRunTestOnMainThreadLoop() {
 #if defined(OS_POSIX)
   if (handle_sigterm_) {
     g_browser_process_pid = base::GetCurrentProcId();
     signal(SIGTERM, DumpStackTraceSignalHandler);
   }
 #endif  // defined(OS_POSIX)
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTracing)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableTracing)) {
     base::debug::CategoryFilter category_filter(
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kEnableTracing));
     TracingController::GetInstance()->EnableRecording(
         category_filter,
         base::debug::TraceOptions(base::debug::RECORD_CONTINUOUSLY),
         TracingController::EnableRecordingDoneCallback());
   }
 
   RunTestOnMainThreadLoop();
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableTracing)) {
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableTracing)) {
     base::FilePath trace_file =
-        CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+        base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
             switches::kEnableTracingOutput);
     // If there was no file specified, put a hardcoded one in the current
     // working directory.
     if (trace_file.empty())
       trace_file = base::FilePath().AppendASCII("trace.json");
 
     // Wait for tracing to collect results from the renderers.
     base::RunLoop run_loop;
     TracingController::GetInstance()->DisableRecording(
         TracingControllerImpl::CreateFileSink(
             trace_file,
             base::Bind(&TraceDisableRecordingComplete,
                        run_loop.QuitClosure(),
                        trace_file)));
     run_loop.Run();
   }
 }
 
 void BrowserTestBase::CreateTestServer(const base::FilePath& test_server_base) {
   CHECK(!test_server_.get());
   test_server_.reset(new net::SpawnedTestServer(
       net::SpawnedTestServer::TYPE_HTTP,
       net::SpawnedTestServer::kLocalhost,
       test_server_base));
 }
 
 void BrowserTestBase::PostTaskToInProcessRendererAndWait(
     const base::Closure& task) {
-  CHECK(CommandLine::ForCurrentProcess()->HasSwitch(switches::kSingleProcess));
+  CHECK(base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kSingleProcess));
 
   scoped_refptr<MessageLoopRunner> runner = new MessageLoopRunner;
 
   base::MessageLoop* renderer_loop =
       RenderProcessHostImpl::GetInProcessRendererThreadForTesting();
   CHECK(renderer_loop);
 
   renderer_loop->PostTask(
       FROM_HERE,
       base::Bind(&RunTaskOnRendererThread, task, runner->QuitClosure()));
   runner->Run();
 }
 
 void BrowserTestBase::EnablePixelOutput() { enable_pixel_output_ = true; }
 
 void BrowserTestBase::UseSoftwareCompositing() {
   use_software_compositing_ = true;
 }
 
 bool BrowserTestBase::UsingOSMesa() const {
-  CommandLine* cmd = CommandLine::ForCurrentProcess();
+  base::CommandLine* cmd = base::CommandLine::ForCurrentProcess();
   return cmd->GetSwitchValueASCII(switches::kUseGL) ==
          gfx::kGLImplementationOSMesaName;
 }
 
 }  // namespace content