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

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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/test_launcher.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 158 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WrapperTestLauncherDelegate);
 };
 
 bool WrapperTestLauncherDelegate::ShouldRunTest(
     const std::string& test_case_name,
     const std::string& test_name) {
   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;
   }
 
   if (StartsWithASCII(test_name, kPreTestPrefix, true)) {
     // We will actually run PRE_ tests, but to ensure they run on the same shard
     // as dependent tests, handle all these details internally.
     return false;
   }
 
   return true;
@@ skipping 118 matching lines @@
   for (size_t i = 0; i < tests_to_run_now.size(); i++)
     DoRunTest(test_launcher, tests_to_run_now[i]);
 
   return test_names_set.size();
 }
 
 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);
   }
 
   // Always enable disabled tests.  This method is not called with disabled
   // tests unless this flag was specified to the browser test executable.
   new_cmd_line.AppendSwitch("gtest_also_run_disabled_tests");
   new_cmd_line.AppendSwitchASCII("gtest_filter", test_name);
   new_cmd_line.AppendSwitch(kSingleProcessTestsFlag);
 
@@ skipping 88 matching lines @@
 TestLauncherDelegate::~TestLauncherDelegate() {
 }
 
 int LaunchTests(TestLauncherDelegate* launcher_delegate,
                 int default_jobs,
                 int argc,
                 char** argv) {
   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();
     return 0;
   }
 
   scoped_ptr<ContentMainDelegate> chrome_main_delegate(
       launcher_delegate->CreateContentMainDelegate());
   ContentMainParams params(chrome_main_delegate.get());
 
@@ skipping 48 matching lines @@
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 ContentMainParams* GetContentMainParams() {
   return g_params;
 }
 
 }  // namespace content