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

win8/delegate_execute/command_execute_impl.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.
 // Implementation of the CommandExecuteImpl class which implements the
 // IExecuteCommand and related interfaces for handling ShellExecute based
 // launches of the Chrome browser.
 
 #include "win8/delegate_execute/command_execute_impl.h"
 
 #include <shlguid.h>
@@ skipping 73 matching lines @@
         delegate_exe_path.DirName()
                          .Append(chrome::kBrowserProcessExecutableName);
   }
 
   if (!base::PathExists(chrome_exe_path)) {
     AtlTrace("Could not locate chrome.exe at: %ls\n",
              chrome_exe_path.value().c_str());
     return false;
   }
 
-  CommandLine cl(chrome_exe_path);
+  base::CommandLine cl(chrome_exe_path);
 
   // Prevent a Chrome window from showing up on the desktop.
   cl.AppendSwitch(switches::kSilentLaunch);
 
   // Tell Chrome to connect to the Metro viewer process.
   cl.AppendSwitch(switches::kViewerConnect);
 
   base::LaunchOptions launch_options;
   launch_options.start_hidden = true;
 
@@ skipping 55 matching lines @@
 //       E_APPLICATION_NOT_REGISTERED is always returned if Chrome is not the
 //       default browser (this case will have already been checked for by
 //       GetLaunchMode() and AHE_DESKTOP returned), but we don't know if it can
 //       be returned for other reasons.
 //
 // Note that if a command line --force-xxx is present we write that launch mode
 // in the registry so next time the logic reaches 5c-ii it will use the same
 // mode again.
 //
 CommandExecuteImpl::CommandExecuteImpl()
-    : parameters_(CommandLine::NO_PROGRAM),
+    : parameters_(base::CommandLine::NO_PROGRAM),
       launch_scheme_(INTERNET_SCHEME_DEFAULT),
       integrity_level_(base::INTEGRITY_UNKNOWN) {
   memset(&start_info_, 0, sizeof(start_info_));
   start_info_.cb = sizeof(start_info_);
 
   // We need to query the user data dir of chrome so we need chrome's
   // path provider. We can be created multiple times in a single instance
   // however so make sure we do this only once.
   if (!path_provider_initialized_) {
     chrome::RegisterPathProvider();
@@ skipping 203 matching lines @@
       // chrome is the default we should treat it as a parameter to be passed
       // to chrome.
       if (display_name.find(installer::kChromeExe) != base::string16::npos)
         display_name.clear();
       break;
 
     default:
       break;
   }
 
-  CommandLine chrome(
-      delegate_execute::MakeChromeCommandLine(chrome_exe_, parameters_,
-                                              display_name));
+  base::CommandLine chrome(delegate_execute::MakeChromeCommandLine(
+      chrome_exe_, parameters_, display_name));
   base::string16 command_line(chrome.GetCommandLineString());
 
   AtlTrace("Formatted command line is %ls\n", command_line.c_str());
 
   PROCESS_INFORMATION temp_process_info = {};
   BOOL ret = CreateProcess(chrome_exe_.value().c_str(),
                            &command_line[0],
                            NULL, NULL, FALSE, 0, NULL, NULL, &start_info_,
                            &temp_process_info);
   if (ret) {
@@ skipping 40 matching lines @@
     launch_mode = ECHUIM_IMMERSIVE;
     launch_mode_determined = true;
     return launch_mode;
   }
 
   // From here on, if we can, we will write the outcome
   // of this function to the registry.
   if (parameters_.HasSwitch(switches::kForceImmersive)) {
     launch_mode = ECHUIM_IMMERSIVE;
     launch_mode_determined = true;
-    parameters_ = CommandLine(CommandLine::NO_PROGRAM);
+    parameters_ = base::CommandLine(base::CommandLine::NO_PROGRAM);
   } else if (parameters_.HasSwitch(switches::kForceDesktop)) {
     launch_mode = ECHUIM_DESKTOP;
     launch_mode_determined = true;
-    parameters_ = CommandLine(CommandLine::NO_PROGRAM);
+    parameters_ = base::CommandLine(base::CommandLine::NO_PROGRAM);
   }
 
   base::win::RegKey reg_key;
   LONG key_result = reg_key.Create(HKEY_CURRENT_USER,
                                    chrome::kMetroRegistryPath,
                                    KEY_ALL_ACCESS);
   if (key_result != ERROR_SUCCESS) {
     AtlTrace("Failed to open HKCU %ls key, error 0x%x\n",
              chrome::kMetroRegistryPath,
              key_result);
@@ skipping 23 matching lines @@
     AtlTrace("Invalid registry launch mode value %u\n", reg_value);
     launch_mode = ECHUIM_DESKTOP;
   } else {
     launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value);
     AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]);
   }
 
   launch_mode_determined = true;
   return launch_mode;
 }