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

chrome/app_shim/chrome_main_app_mode_mac.mm

 // Copyright 2013 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.
 
 // On Mac, one can't make shortcuts with command-line arguments. Instead, we
 // produce small app bundles which locate the Chromium framework and load it,
 // passing the appropriate data. This is the entry point into the framework for
 // those app bundles.
 
 #import <Cocoa/Cocoa.h>
@@ skipping 194 matching lines @@
 }
 
 void AppShimController::CreateChannelAndSendLaunchApp(
     const base::FilePath& socket_path) {
   IPC::ChannelHandle handle(socket_path.value());
   channel_ = IPC::ChannelProxy::Create(handle,
                                        IPC::Channel::MODE_NAMED_CLIENT,
                                        this,
                                        g_io_thread->message_loop_proxy().get());
 
-  bool launched_by_chrome =
-      CommandLine::ForCurrentProcess()->HasSwitch(
-          app_mode::kLaunchedByChromeProcessId);
+  bool launched_by_chrome = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      app_mode::kLaunchedByChromeProcessId);
   apps::AppShimLaunchType launch_type = launched_by_chrome ?
           apps::APP_SHIM_LAUNCH_REGISTER_ONLY : apps::APP_SHIM_LAUNCH_NORMAL;
 
   [delegate_ setController:this];
 
   std::vector<base::FilePath> files;
   [delegate_ getFilesToOpenAtStartup:&files];
 
   channel_->Send(new AppShimHostMsg_LaunchApp(
       g_info->profile_dir, g_info->app_mode_id, launch_type, files));
@@ skipping 328 matching lines @@
 extern "C" {
 
 // |ChromeAppModeStart()| is the point of entry into the framework from the app
 // mode loader.
 __attribute__((visibility("default")))
 int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info);
 
 }  // extern "C"
 
 int ChromeAppModeStart(const app_mode::ChromeAppModeInfo* info) {
-  CommandLine::Init(info->argc, info->argv);
+  base::CommandLine::Init(info->argc, info->argv);
 
   base::mac::ScopedNSAutoreleasePool scoped_pool;
   base::AtExitManager exit_manager;
   chrome::RegisterPathProvider();
 
   if (info->major_version < app_mode::kCurrentChromeAppModeInfoMajorVersion) {
     RAW_LOG(ERROR, "App Mode Loader too old.");
     return 1;
   }
   if (info->major_version > app_mode::kCurrentChromeAppModeInfoMajorVersion) {
@@ skipping 32 matching lines @@
 
   // Launch the IO thread.
   base::Thread::Options io_thread_options;
   io_thread_options.message_loop_type = base::MessageLoop::TYPE_IO;
   base::Thread *io_thread = new base::Thread("CrAppShimIO");
   io_thread->StartWithOptions(io_thread_options);
   g_io_thread = io_thread;
 
   // Find already running instances of Chrome.
   pid_t pid = -1;
-  std::string chrome_process_id = CommandLine::ForCurrentProcess()->
-      GetSwitchValueASCII(app_mode::kLaunchedByChromeProcessId);
+  std::string chrome_process_id =
+      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          app_mode::kLaunchedByChromeProcessId);
   if (!chrome_process_id.empty()) {
     if (!base::StringToInt(chrome_process_id, &pid))
       LOG(FATAL) << "Invalid PID: " << chrome_process_id;
   } else {
     NSString* chrome_bundle_id = [base::mac::OuterBundle() bundleIdentifier];
     NSArray* existing_chrome = [NSRunningApplication
         runningApplicationsWithBundleIdentifier:chrome_bundle_id];
     if ([existing_chrome count] > 0)
       pid = [[existing_chrome objectAtIndex:0] processIdentifier];
   }
 
   AppShimController controller;
   base::MessageLoopForUI main_message_loop;
   main_message_loop.set_thread_name("MainThread");
   base::PlatformThread::SetName("CrAppShimMain");
 
   // In tests, launching Chrome does nothing, and we won't get a ping response,
   // so just assume the socket exists.
   if (pid == -1 &&
-      !CommandLine::ForCurrentProcess()->HasSwitch(
+      !base::CommandLine::ForCurrentProcess()->HasSwitch(
           app_mode::kLaunchedForTest)) {
     // Launch Chrome if it isn't already running.
     ProcessSerialNumber psn;
-    CommandLine command_line(CommandLine::NO_PROGRAM);
+    base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     command_line.AppendSwitch(switches::kSilentLaunch);
 
     // If the shim is the app launcher, pass --show-app-list when starting a new
     // Chrome process to inform startup codepaths and load the correct profile.
     if (info->app_mode_id == app_mode::kAppListModeId) {
       command_line.AppendSwitch(switches::kShowAppList);
     } else {
       command_line.AppendSwitchPath(switches::kProfileDirectory,
                                     info->profile_dir);
     }
@@ skipping 28 matching lines @@
     // minute.
     main_message_loop.PostTask(
         FROM_HERE,
         base::Bind(&AppShimController::Init,
                    base::Unretained(&controller)));
   }
 
   main_message_loop.Run();
   return 0;
 }