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

chrome/browser/chrome_browser_main_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/chrome_browser_main_win.h"
 
 #include <windows.h>
 #include <shellapi.h>
 
 #include <algorithm>
@@ skipping 163 matching lines @@
     const content::MainFunctionParams& parameters)
     : ChromeBrowserMainParts(parameters) {
   if (base::win::IsMetroProcess()) {
     typedef const wchar_t* (*GetMetroSwitches)(void);
     GetMetroSwitches metro_switches_proc = reinterpret_cast<GetMetroSwitches>(
         GetProcAddress(base::win::GetMetroModule(),
                        "GetMetroCommandLineSwitches"));
     if (metro_switches_proc) {
       base::string16 metro_switches = (*metro_switches_proc)();
       if (!metro_switches.empty()) {
-        CommandLine extra_switches(CommandLine::NO_PROGRAM);
+        base::CommandLine extra_switches(base::CommandLine::NO_PROGRAM);
         extra_switches.ParseFromString(metro_switches);
-        CommandLine::ForCurrentProcess()->AppendArguments(extra_switches,
-                                                          false);
+        base::CommandLine::ForCurrentProcess()->AppendArguments(extra_switches,
+                                                                false);
       }
     }
   }
 }
 
 ChromeBrowserMainPartsWin::~ChromeBrowserMainPartsWin() {
 }
 
 void ChromeBrowserMainPartsWin::ToolkitInitialized() {
   ChromeBrowserMainParts::ToolkitInitialized();
@@ skipping 34 matching lines @@
   // functions in the kernel (win32k.sys). If we are on Windows 8+ and if
   // we are launched with the kEnableWin32kRendererLockDown switch then we
   // force the PDF pepper plugin to run out of process. This is because the
   // PDF plugin uses GDI for text rendering which does not work in the
   // Win32K lockdown mode. Running it out of process ensures that the process
   // launched for the plugin does not have the Win32K lockdown mode enabled.
   // TODO(ananta)
   // Revisit this when the pdf plugin uses skia and stops using GDI.
   if (switches::IsWin32kRendererLockdownEnabled() &&
       base::win::GetVersion() >= base::win::VERSION_WIN8) {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
+    base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableOutOfProcessPdf);
   }
   return rv;
 }
 
 void ChromeBrowserMainPartsWin::ShowMissingLocaleMessageBox() {
   ui::MessageBox(NULL,
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
                  base::ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
                  MB_OK | MB_ICONERROR | MB_TOPMOST);
@@ skipping 38 matching lines @@
   // September 2014.
   InitializeDisableTerminateOnHeapCorruptionExperiment();
 
 #if defined(GOOGLE_CHROME_BUILD)
   did_run_updater_.reset(new DidRunUpdater);
 #endif
 }
 
 // static
 void ChromeBrowserMainPartsWin::PrepareRestartOnCrashEnviroment(
-    const CommandLine& parsed_command_line) {
+    const base::CommandLine& parsed_command_line) {
   // Clear this var so child processes don't show the dialog by default.
   scoped_ptr<base::Environment> env(base::Environment::Create());
   env->UnSetVar(env_vars::kShowRestart);
 
   // For non-interactive tests we don't restart on crash.
   if (env->HasVar(env_vars::kHeadless))
     return;
 
   // If the known command-line test options are used we don't create the
   // environment block which means we don't get the restart dialog.
@@ skipping 13 matching lines @@
   dlg_strings.append(adjusted_string);
   dlg_strings.push_back('|');
   dlg_strings.append(base::ASCIIToUTF16(
       base::i18n::IsRTL() ? env_vars::kRtlLocale : env_vars::kLtrLocale));
 
   env->SetVar(env_vars::kRestartInfo, base::UTF16ToUTF8(dlg_strings));
 }
 
 // static
 void ChromeBrowserMainPartsWin::RegisterApplicationRestart(
-    const CommandLine& parsed_command_line) {
+    const base::CommandLine& parsed_command_line) {
   DCHECK(base::win::GetVersion() >= base::win::VERSION_VISTA);
   base::ScopedNativeLibrary library(base::FilePath(L"kernel32.dll"));
   // Get the function pointer for RegisterApplicationRestart.
   RegisterApplicationRestartProc register_application_restart =
       reinterpret_cast<RegisterApplicationRestartProc>(
           library.GetFunctionPointer("RegisterApplicationRestart"));
   if (!register_application_restart) {
     LOG(WARNING) << "Cannot find RegisterApplicationRestart in kernel32.dll";
     return;
   }
   // The Windows Restart Manager expects a string of command line flags only,
   // without the program.
-  CommandLine command_line(CommandLine::NO_PROGRAM);
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
   command_line.AppendArguments(parsed_command_line, false);
   if (!command_line.HasSwitch(switches::kRestoreLastSession))
     command_line.AppendSwitch(switches::kRestoreLastSession);
 
   // Restart Chrome if the computer is restarted as the result of an update.
   // This could be extended to handle crashes, hangs, and patches.
   HRESULT hr = register_application_restart(
       command_line.GetCommandLineString().c_str(),
       RESTART_NO_CRASH | RESTART_NO_HANG | RESTART_NO_PATCH);
   if (FAILED(hr)) {
     if (hr == E_INVALIDARG) {
       LOG(WARNING) << "Command line too long for RegisterApplicationRestart";
     } else {
       NOTREACHED() << "RegisterApplicationRestart failed. hr: " << hr <<
                       ", command_line: " << command_line.GetCommandLineString();
     }
   }
 }
 
 // static
 int ChromeBrowserMainPartsWin::HandleIconsCommands(
-    const CommandLine& parsed_command_line) {
+    const base::CommandLine& parsed_command_line) {
   if (parsed_command_line.HasSwitch(switches::kHideIcons)) {
     base::string16 cp_applet;
     base::win::Version version = base::win::GetVersion();
     if (version >= base::win::VERSION_VISTA) {
       cp_applet.assign(L"Programs and Features");  // Windows Vista and later.
     } else if (version >= base::win::VERSION_XP) {
       cp_applet.assign(L"Add/Remove Programs");  // Windows XP.
     } else {
       return chrome::RESULT_CODE_UNSUPPORTED_PARAM;  // Not supported
     }
@@ skipping 30 matching lines @@
         // The dialog cannot be shown in Win8 Metro as doing so hangs Chrome on
         // an invisible dialog.
         // TODO (gab): Get rid of this dialog altogether and auto-launch
         // system-level Chrome instead.
         const base::string16 text =
             l10n_util::GetStringUTF16(IDS_MACHINE_LEVEL_INSTALL_CONFLICT);
         const base::string16 caption = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
         const UINT flags = MB_OK | MB_ICONERROR | MB_TOPMOST;
         ui::MessageBox(NULL, text, caption, flags);
       }
-      CommandLine uninstall_cmd(
+      base::CommandLine uninstall_cmd(
           InstallUtil::GetChromeUninstallCmd(false, dist->GetType()));
       if (!uninstall_cmd.GetProgram().empty()) {
         uninstall_cmd.AppendSwitch(installer::switches::kSelfDestruct);
         uninstall_cmd.AppendSwitch(installer::switches::kForceUninstall);
         uninstall_cmd.AppendSwitch(
             installer::switches::kDoNotRemoveSharedItems);
 
         // Trigger Active Setup for the system-level Chrome to make sure
         // per-user shortcuts to the system-level Chrome are created. Skip this
         // if the system-level Chrome will undergo first run anyway, as Active
@@ skipping 44 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return base::string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }