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

content/shell/browser/layout_test/layout_test_browser_main.cc

 // Copyright 2014 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/shell/browser/layout_test/layout_test_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 74 matching lines @@
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     if (net::FileURLToFilePath(test_url, &local_path))
       *current_working_directory = local_path.DirName();
     else
       base::GetCurrentDirectory(current_working_directory);
   }
   return test_url;
 }
 
-bool GetNextTest(const CommandLine::StringVector& args,
+bool GetNextTest(const base::CommandLine::StringVector& args,
                  size_t* position,
                  std::string* test) {
   if (*position >= args.size())
     return false;
   if (args[*position] == FILE_PATH_LITERAL("-"))
     return !!std::getline(std::cin, *test, '\n');
 #if defined(OS_WIN)
   *test = base::WideToUTF8(args[(*position)++]);
 #else
   *test = args[(*position)++];
@@ skipping 44 matching lines @@
 int RunTests(const scoped_ptr<content::BrowserMainRunner>& main_runner) {
   content::WebKitTestController test_controller;
   {
     // We're outside of the message loop here, and this is a test.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
     base::FilePath temp_path;
     base::GetTempDir(&temp_path);
     test_controller.SetTempPath(temp_path);
   }
   std::string test_string;
-  CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
+  base::CommandLine::StringVector args =
+      base::CommandLine::ForCurrentProcess()->GetArgs();
   size_t command_line_position = 0;
   bool ran_at_least_once = false;
 
   std::cout << "#READY\n";
   std::cout.flush();
 
   while (GetNextTest(args, &command_line_position, &test_string)) {
     if (!RunOneTest(test_string, &ran_at_least_once, main_runner))
       break;
   }
@@ skipping 16 matching lines @@
 }  // namespace
 
 // Main routine for running as the Browser process.
 int LayoutTestBrowserMain(
     const content::MainFunctionParams& parameters,
     const scoped_ptr<content::BrowserMainRunner>& main_runner) {
   base::ScopedTempDir browser_context_path_for_layout_tests;
 
   CHECK(browser_context_path_for_layout_tests.CreateUniqueTempDir());
   CHECK(!browser_context_path_for_layout_tests.path().MaybeAsASCII().empty());
-  CommandLine::ForCurrentProcess()->AppendSwitchASCII(
+  base::CommandLine::ForCurrentProcess()->AppendSwitchASCII(
       switches::kContentShellDataPath,
       browser_context_path_for_layout_tests.path().MaybeAsASCII());
 
 #if defined(OS_ANDROID)
   content::EnsureInitializeForAndroidLayoutTests();
 #endif
 
   int exit_code = main_runner->Initialize(parameters);
   DCHECK_LT(exit_code, 0)
       << "BrowserMainRunner::Initialize failed in LayoutTestBrowserMain";
 
   if (exit_code >= 0)
     return exit_code;
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kCheckLayoutTestSysDeps)) {
     base::MessageLoop::current()->PostTask(FROM_HERE,
                                            base::MessageLoop::QuitClosure());
     main_runner->Run();
     content::Shell::CloseAllWindows();
     main_runner->Shutdown();
     return 0;
   }
 
   exit_code = RunTests(main_runner);
 
 #if !defined(OS_ANDROID)
   main_runner->Shutdown();
 #endif
 
   return exit_code;
 }