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

chrome/browser/first_run/upgrade_util_win.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/first_run/upgrade_util.h"
 
 #include <windows.h>
 #include <psapi.h>
 #include <shellapi.h>
 
@@ skipping 99 matching lines @@
 RelaunchMode RelaunchModeStringToEnum(const std::string& relaunch_mode) {
   if (relaunch_mode == kRelaunchModeMetro)
     return RELAUNCH_MODE_METRO;
 
   if (relaunch_mode == kRelaunchModeDesktop)
     return RELAUNCH_MODE_DESKTOP;
 
   // On Windows 7 if the current browser is in Chrome OS mode, then restart
   // into Chrome OS mode.
   if ((base::win::GetVersion() == base::win::VERSION_WIN7) &&
-       CommandLine::ForCurrentProcess()->HasSwitch(switches::kViewerConnect) &&
-       !g_browser_process->local_state()->HasPrefPath(prefs::kRelaunchMode)) {
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kViewerConnect) &&
+      !g_browser_process->local_state()->HasPrefPath(prefs::kRelaunchMode)) {
     // TODO(ananta)
     // On Windows 8, the delegate execute process looks up the previously
     // launched mode from the registry and relaunches into that mode. We need
     // something similar on Windows 7. For now, set the pref to ensure that
     // we get relaunched into Chrome OS mode.
     g_browser_process->local_state()->SetString(
         prefs::kRelaunchMode, upgrade_util::kRelaunchModeMetro);
     return RELAUNCH_MODE_METRO;
   }
 
   return RELAUNCH_MODE_DEFAULT;
 }
 
-bool RelaunchChromeHelper(const CommandLine& command_line,
+bool RelaunchChromeHelper(const base::CommandLine& command_line,
                           const RelaunchMode& relaunch_mode) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string version_str;
 
   // Get the version variable and remove it from the environment.
   if (env->GetVar(chrome::kChromeVersionEnvVar, &version_str))
     env->UnSetVar(chrome::kChromeVersionEnvVar);
   else
     version_str.clear();
 
   base::FilePath chrome_exe;
   if (!PathService::Get(base::FILE_EXE, &chrome_exe)) {
     NOTREACHED();
     return false;
   }
 
   // Explicitly make sure to relaunch chrome.exe rather than old_chrome.exe.
   // This can happen when old_chrome.exe is launched by a user.
-  CommandLine chrome_exe_command_line = command_line;
+  base::CommandLine chrome_exe_command_line = command_line;
   chrome_exe_command_line.SetProgram(
       chrome_exe.DirName().Append(installer::kChromeExe));
 
   if (base::win::GetVersion() < base::win::VERSION_WIN8 &&
       relaunch_mode != RELAUNCH_MODE_METRO &&
       relaunch_mode != RELAUNCH_MODE_DESKTOP)
     return base::LaunchProcess(chrome_exe_command_line,
                                base::LaunchOptions()).IsValid();
 
   // On Windows 8 we always use the delegate_execute for re-launching chrome.
@@ skipping 13 matching lines @@
   // The |mutex| handle needs to be leaked. See comment above.
   if (!mutex) {
     NOTREACHED();
     return false;
   }
   if (::GetLastError() == ERROR_ALREADY_EXISTS) {
     NOTREACHED() << "Relaunch mutex already exists";
     return false;
   }
 
-  CommandLine relaunch_cmd(CommandLine::NO_PROGRAM);
+  base::CommandLine relaunch_cmd(base::CommandLine::NO_PROGRAM);
   relaunch_cmd.AppendSwitchPath(switches::kRelaunchShortcut,
       ShellIntegration::GetStartMenuShortcut(chrome_exe));
   relaunch_cmd.AppendSwitchNative(switches::kWaitForMutex, mutex_name);
 
   if (relaunch_mode != RELAUNCH_MODE_DEFAULT) {
     relaunch_cmd.AppendSwitch(relaunch_mode == RELAUNCH_MODE_METRO?
         switches::kForceImmersive : switches::kForceDesktop);
   }
 
   base::string16 params(relaunch_cmd.GetCommandLineString());
@@ skipping 14 matching lines @@
   if (!pid)
     return false;
   // The next call appears to be needed if we are relaunching from desktop into
   // metro mode. The observed effect if not done is that chrome starts in metro
   // mode but it is not given focus and it gets killed by windows after a few
   // seconds.
   ::AllowSetForegroundWindow(pid);
   return true;
 }
 
-bool RelaunchChromeBrowser(const CommandLine& command_line) {
+bool RelaunchChromeBrowser(const base::CommandLine& command_line) {
   return RelaunchChromeHelper(command_line, RELAUNCH_MODE_DEFAULT);
 }
 
-bool RelaunchChromeWithMode(const CommandLine& command_line,
+bool RelaunchChromeWithMode(const base::CommandLine& command_line,
                             const RelaunchMode& relaunch_mode) {
   return RelaunchChromeHelper(command_line, relaunch_mode);
 }
 
 bool IsUpdatePendingRestart() {
   base::FilePath new_chrome_exe;
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
   return base::PathExists(new_chrome_exe);
 }
@@ skipping 48 matching lines @@
                            mapped_file_name,
                            arraysize(mapped_file_name))) {
     return false;
   }
 
   base::FilePath file_name(base::FilePath(mapped_file_name).BaseName());
   return base::FilePath::CompareEqualIgnoreCase(file_name.value(),
                                                 installer::kChromeOldExe);
 }
 
-bool DoUpgradeTasks(const CommandLine& command_line) {
+bool DoUpgradeTasks(const base::CommandLine& command_line) {
   // The DelegateExecute verb handler finalizes pending in-use updates for
   // metro mode launches, as Chrome cannot be gracefully relaunched when
   // running in this mode.
   if (base::win::IsMetroProcess())
     return false;
   if (!SwapNewChromeExeIfPresent() && !IsRunningOldChrome())
     return false;
   // At this point the chrome.exe has been swapped with the new one.
   if (!RelaunchChromeBrowser(command_line)) {
     // The re-launch fails. Feel free to panic now.
     NOTREACHED();
   }
   return true;
 }
 
 }  // namespace upgrade_util