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

chrome/app_shim/app_mode_loader_mac.mm

 // 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.
 
 // On Mac, shortcuts can't have command-line arguments. Instead, produce small
 // app bundles which locate the Chromium framework and load it, passing the
 // appropriate data. This is the code for such an app bundle. It should be kept
 // minimal and do as little work as possible (with as much work done on
 // framework side as possible).
 
@@ skipping 131 matching lines @@
     if (!ChromeAppModeStart)
       LOG(ERROR) << "Couldn't get entry point: " << dlerror();
   } else {
     LOG(ERROR) << "Couldn't load framework: " << dlerror();
   }
 
   if (ChromeAppModeStart)
     return ChromeAppModeStart(info);
 
   LOG(ERROR) << "Loading Chrome failed, launching Chrome with command line";
-  CommandLine command_line(executable_path);
+  base::CommandLine command_line(executable_path);
   // The user_data_dir from the plist is actually the app data dir.
   command_line.AppendSwitchPath(
       switches::kUserDataDir,
       info->user_data_dir.DirName().DirName().DirName());
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           app_mode::kLaunchedByChromeProcessId) ||
       info->app_mode_id == app_mode::kAppListModeId) {
     // Pass --app-shim-error to have Chrome rebuild this shim.
     // If Chrome has rebuilt this shim once already, then rebuilding doesn't fix
     // the problem, so don't try again.
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+    if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
             app_mode::kLaunchedAfterRebuild)) {
       command_line.AppendSwitchPath(app_mode::kAppShimError,
                                     app_mode_bundle_path);
     }
   } else {
     // If the shim was launched directly (instead of by Chrome), first ask
     // Chrome to launch the app. Chrome will launch the shim again, the same
     // error will occur and be handled above. This approach allows the app to be
     // started without blocking on fixing the shim and guarantees that the
     // profile is loaded when Chrome receives --app-shim-error.
@@ skipping 10 matching lines @@
     return 1;
   }
 
   return 0;
 }
 
 } // namespace
 
 __attribute__((visibility("default")))
 int main(int argc, char** argv) {
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
   app_mode::ChromeAppModeInfo info;
 
   // Hard coded info parameters.
   info.major_version = app_mode::kCurrentChromeAppModeInfoMajorVersion;
   info.minor_version = app_mode::kCurrentChromeAppModeInfoMinorVersion;
   info.argc = argc;
   info.argv = argv;
 
   // Exit instead of returning to avoid the the removal of |main()| from stack
   // backtraces under tail call optimization.
   exit(LoadFrameworkAndStart(&info));
 }