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

chrome/browser/shell_integration.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 "chrome/browser/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/prefs/pref_service.h"
@@ skipping 35 matching lines @@
 const struct ShellIntegration::AppModeInfo* ShellIntegration::AppModeInfo() {
   return gAppModeInfo;
 }
 
 // static
 bool ShellIntegration::IsRunningInAppMode() {
   return gAppModeInfo != NULL;
 }
 
 // static
-CommandLine ShellIntegration::CommandLineArgsForLauncher(
+base::CommandLine ShellIntegration::CommandLineArgsForLauncher(
     const GURL& url,
     const std::string& extension_app_id,
     const base::FilePath& profile_path) {
   base::ThreadRestrictions::AssertIOAllowed();
-  CommandLine new_cmd_line(CommandLine::NO_PROGRAM);
+  base::CommandLine new_cmd_line(base::CommandLine::NO_PROGRAM);
 
   AppendProfileArgs(
       extension_app_id.empty() ? base::FilePath() : profile_path,
       &new_cmd_line);
 
   // If |extension_app_id| is present, we use the kAppId switch rather than
   // the kApp switch (the launch url will be read from the extension app
   // during launch.
   if (!extension_app_id.empty()) {
     new_cmd_line.AppendSwitchASCII(switches::kAppId, extension_app_id);
   } else {
     // Use '--app=url' instead of just 'url' to launch the browser with minimal
     // chrome.
     // Note: Do not change this flag!  Old Gears shortcuts will break if you do!
     new_cmd_line.AppendSwitchASCII(switches::kApp, url.spec());
   }
   return new_cmd_line;
 }
 
 // static
-void ShellIntegration::AppendProfileArgs(
-    const base::FilePath& profile_path,
-    CommandLine* command_line) {
+void ShellIntegration::AppendProfileArgs(const base::FilePath& profile_path,
+                                         base::CommandLine* command_line) {
   DCHECK(command_line);
-  const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+  const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
 
   // Use the same UserDataDir for new launches that we currently have set.
   base::FilePath user_data_dir =
       cmd_line.GetSwitchValuePath(switches::kUserDataDir);
 #if defined(OS_MACOSX) || defined(OS_WIN)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 #endif
   if (!user_data_dir.empty()) {
     // Make sure user_data_dir is an absolute path.
     user_data_dir = base::MakeAbsoluteFilePath(user_data_dir);
@@ skipping 209 matching lines @@
     case ShellIntegration::SET_DEFAULT_INTERACTIVE:
       if (interactive_permitted) {
         result = ShellIntegration::SetAsDefaultProtocolClientInteractive(
             protocol_);
       }
       break;
   }
 
   return result;
 }