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

content/public/test/test_launcher.cc

Index: content/public/test/test_launcher.cc
diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc
index 1caefb6cc189188d8ca6c8d11a7066da3947b6ae..c5de324eff1f32da09ba94136199cdb86ee0b43f 100644
--- a/content/public/test/test_launcher.cc
+++ b/content/public/test/test_launcher.cc
@@ -176,7 +176,7 @@ bool WrapperTestLauncherDelegate::ShouldRunTest(
   all_test_names_.insert(test_case_name + "." + test_name);
 
   if (StartsWithASCII(test_name, kManualTestPrefix, true) &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(kRunManualTestsFlag)) {
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(kRunManualTestsFlag)) {
     return false;
   }
 
@@ -315,18 +315,18 @@ void WrapperTestLauncherDelegate::DoRunTest(base::TestLauncher* test_launcher,
                                             const std::string& test_name) {
   std::string test_name_no_pre(RemoveAnyPrePrefixes(test_name));
 
-  CommandLine cmd_line(*CommandLine::ForCurrentProcess());
+  base::CommandLine cmd_line(*base::CommandLine::ForCurrentProcess());
   CHECK(launcher_delegate_->AdjustChildProcessCommandLine(
             &cmd_line, user_data_dir_map_[test_name_no_pre]));
 
-  CommandLine new_cmd_line(cmd_line.GetProgram());
-  CommandLine::SwitchMap switches = cmd_line.GetSwitches();
+  base::CommandLine new_cmd_line(cmd_line.GetProgram());
+  base::CommandLine::SwitchMap switches = cmd_line.GetSwitches();
 
   // Strip out gtest_output flag because otherwise we would overwrite results
   // of the other tests.
   switches.erase(base::kGTestOutputFlag);
 
-  for (CommandLine::SwitchMap::const_iterator iter = switches.begin();
+  for (base::CommandLine::SwitchMap::const_iterator iter = switches.begin();
        iter != switches.end(); ++iter) {
     new_cmd_line.AppendSwitchNative(iter->first, iter->second);
   }
@@ -435,8 +435,9 @@ int LaunchTests(TestLauncherDelegate* launcher_delegate,
   DCHECK(!g_launcher_delegate);
   g_launcher_delegate = launcher_delegate;
 
-  CommandLine::Init(argc, argv);
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  base::CommandLine::Init(argc, argv);
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
 
   if (command_line->HasSwitch(kHelpFlag)) {
     PrintUsage();