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

content/shell/app/shell_main_delegate.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/shell/app/shell_main_delegate.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/cpu.h"
 #include "base/files/file.h"
@@ skipping 111 matching lines @@
 #endif
 #if defined(OS_MACOSX)
   // Needs to happen before InitializeResourceBundle() and before
   // BlinkTestPlatformInitialize() are called.
   OverrideFrameworkBundlePath();
   OverrideChildProcessPath();
   EnsureCorrectResolutionSettings();
 #endif  // OS_MACOSX
 
   InitLogging();
-  CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)) {
     // If CheckLayoutSystemDeps succeeds, we don't exit early. Instead we
     // continue and try to load the fonts in BlinkTestPlatformInitialize
     // below, and then try to bring up the rest of the content module.
     if (!CheckLayoutSystemDeps()) {
       if (exit_code)
         *exit_code = 1;
       return true;
     }
   }
@@ skipping 59 matching lines @@
   SetContentClient(&content_client_);
   return false;
 }
 
 void ShellMainDelegate::PreSandboxStartup() {
 #if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX))
   // Create an instance of the CPU class to parse /proc/cpuinfo and cache
   // cpu_brand info.
   base::CPU cpu_info;
 #endif
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableCrashReporter)) {
     std::string process_type =
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kProcessType);
     crash_reporter::SetCrashReporterClient(g_shell_crash_client.Pointer());
 #if defined(OS_MACOSX)
     base::mac::DisableOSCrashDumps();
     breakpad::InitCrashReporter(process_type);
     breakpad::InitCrashProcessInfo(process_type);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
     if (process_type != switches::kZygoteProcess) {
 #if defined(OS_ANDROID)
       if (process_type.empty())
@@ skipping 22 matching lines @@
   if (!process_type.empty())
     return -1;
 
 #if !defined(OS_ANDROID)
   // Android stores the BrowserMainRunner instance as a scoped member pointer
   // on the ShellMainDelegate class because of different object lifetime.
   scoped_ptr<BrowserMainRunner> browser_runner_;
 #endif
 
   browser_runner_.reset(BrowserMainRunner::Create());
-  CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
   return command_line.HasSwitch(switches::kDumpRenderTree) ||
                  command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)
              ? LayoutTestBrowserMain(main_function_params, browser_runner_)
              : ShellBrowserMain(main_function_params, browser_runner_);
 }
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
 void ShellMainDelegate::ZygoteForked() {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableCrashReporter)) {
     std::string process_type =
-        CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+        base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
             switches::kProcessType);
     breakpad::InitCrashReporter(process_type);
   }
 }
 #endif
 
 void ShellMainDelegate::InitializeResourceBundle() {
 #if defined(OS_ANDROID)
   // In the Android case, the renderer runs with a different UID and can never
   // access the file system.  So we are passed a file descriptor to the
@@ skipping 23 matching lines @@
 #else
   PathService::Get(base::DIR_MODULE, &pak_dir);
 #endif
 
   pak_file = pak_dir.Append(FILE_PATH_LITERAL("content_shell.pak"));
 #endif
   ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
 }
 
 ContentBrowserClient* ShellMainDelegate::CreateContentBrowserClient() {
-  browser_client_.reset(
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ?
-          new LayoutTestContentBrowserClient :
-          new ShellContentBrowserClient);
+  browser_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
+                            switches::kDumpRenderTree)
+                            ? new LayoutTestContentBrowserClient
+                            : new ShellContentBrowserClient);
 
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
-  renderer_client_.reset(
-      CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree) ?
-          new LayoutTestContentRendererClient :
-          new ShellContentRendererClient);
+  renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
+                             switches::kDumpRenderTree)
+                             ? new LayoutTestContentRendererClient
+                             : new ShellContentRendererClient);
 
   return renderer_client_.get();
 }
 
 }  // namespace content