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

chrome/browser/apps/app_shim/app_shim_interactive_uitest_mac.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
 #include "apps/app_lifetime_monitor_factory.h"
 #include "apps/switches.h"
 #include "base/auto_reset.h"
@@ skipping 391 matching lines @@
         [running_shim objectAtIndex:0]) terminate];
     [ns_observer wait];
 
     EXPECT_FALSE(GetFirstHostedAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 
   // Case 2: Launch the shim, it should start the hosted app.
   {
     HostedAppBrowserListObserver listener(app->id());
-    CommandLine shim_cmdline(CommandLine::NO_PROGRAM);
+    base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
     shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
     ProcessSerialNumber shim_psn;
     ASSERT_TRUE(base::mac::OpenApplicationWithPath(
         shim_path, shim_cmdline, kLSLaunchDefaults, &shim_psn));
     listener.WaitUntilAdded();
 
     ASSERT_TRUE(GetFirstHostedAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
@@ skipping 53 matching lines @@
         [running_shim objectAtIndex:0]) terminate];
     [ns_observer wait];
 
     EXPECT_FALSE(GetFirstAppWindow());
     EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
   }
 
   // Case 2: Launch the shim, it should start the app.
   {
     ExtensionTestMessageListener launched_listener("Launched", false);
-    CommandLine shim_cmdline(CommandLine::NO_PROGRAM);
+    base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
     shim_cmdline.AppendSwitch(app_mode::kLaunchedForTest);
     ProcessSerialNumber shim_psn;
     ASSERT_TRUE(base::mac::OpenApplicationWithPath(
         shim_path, shim_cmdline, kLSLaunchDefaults, &shim_psn));
     ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
     ASSERT_TRUE(GetFirstAppWindow());
     EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 
     // If the window is closed, the shim should quit.
@@ skipping 188 matching lines @@
   // Launch the shim, it should start the app and ultimately connect over IPC.
   // This actually happens in multiple launches of the shim:
   // (1) The shim will fail and instead launch Chrome with --app-id so that the
   //     app starts.
   // (2) Chrome launches the shim in response to an app starting, this time the
   //     shim launches Chrome with --app-shim-error, which causes Chrome to
   //     rebuild the shim.
   // (3) After rebuilding, Chrome again launches the shim and expects it to
   //     behave normally.
   ExtensionTestMessageListener launched_listener("Launched", false);
-  CommandLine shim_cmdline(CommandLine::NO_PROGRAM);
+  base::CommandLine shim_cmdline(base::CommandLine::NO_PROGRAM);
   ASSERT_TRUE(base::mac::OpenApplicationWithPath(
       shim_path, shim_cmdline, kLSLaunchDefaults, NULL));
 
   // Wait for the app to start (1). At this point there is no shim host.
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
   EXPECT_FALSE(HasAppShimHost(profile(), app->id()));
 
   // Wait for the rebuilt shim to connect (3). This does not race with the app
   // starting (1) because Chrome only launches the shim (2) after the app
   // starts. Then Chrome must handle --app-shim-error on the UI thread before
   // the shim is rebuilt.
   WindowedAppShimLaunchObserver(app->id()).Wait();
 
   EXPECT_TRUE(GetFirstAppWindow());
   EXPECT_TRUE(HasAppShimHost(profile(), app->id()));
 }
 
 #endif  // defined(ARCH_CPU_64_BITS)
 
 }  // namespace apps