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

chrome/app/chrome_exe_main_win.cc

 // Copyright (c) 2011 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 <windows.h>
 #include <malloc.h>
 #include <shellscalingapi.h>
 #include <tchar.h>
 
 #include <string>
@@ skipping 25 matching lines @@
 };
 
 bool IsFastStartSwitch(const std::string& command_line_switch) {
   for (size_t i = 0; i < arraysize(kFastStartSwitches); ++i) {
     if (command_line_switch == kFastStartSwitches[i])
       return true;
   }
   return false;
 }
 
-bool ContainsNonFastStartFlag(const CommandLine& command_line) {
-  const CommandLine::SwitchMap& switches = command_line.GetSwitches();
+bool ContainsNonFastStartFlag(const base::CommandLine& command_line) {
+  const base::CommandLine::SwitchMap& switches = command_line.GetSwitches();
   if (switches.size() > arraysize(kFastStartSwitches))
     return true;
-  for (CommandLine::SwitchMap::const_iterator it = switches.begin();
+  for (base::CommandLine::SwitchMap::const_iterator it = switches.begin();
        it != switches.end(); ++it) {
     if (!IsFastStartSwitch(it->first))
       return true;
   }
   return false;
 }
 
-bool AttemptFastNotify(const CommandLine& command_line) {
+bool AttemptFastNotify(const base::CommandLine& command_line) {
   if (ContainsNonFastStartFlag(command_line))
     return false;
 
   base::FilePath user_data_dir;
   if (!chrome::GetDefaultUserDataDirectory(&user_data_dir))
     return false;
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 
   HWND chrome = chrome::FindRunningChromeWindow(user_data_dir);
   if (!chrome)
@@ skipping 62 matching lines @@
   HINSTANCE instance = GetModuleHandle(NULL);
 #endif
   SwitchToLFHeap();
 
   startup_metric_utils::RecordExeMainEntryTime();
 
   // Signal Chrome Elf that Chrome has begun to start.
   SignalChromeElf();
 
   // Initialize the commandline singleton from the environment.
-  CommandLine::Init(0, NULL);
+  base::CommandLine::Init(0, NULL);
   // The exit manager is in charge of calling the dtors of singletons.
   base::AtExitManager exit_manager;
 
   // We don't want to set DPI awareness on pre-Win7 because we don't support
   // DirectWrite there. GDI fonts are kerned very badly, so better to leave
   // DPI-unaware and at effective 1.0. See also ShouldUseDirectWrite().
   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
     EnableHighDPISupport();
 
-  if (AttemptFastNotify(*CommandLine::ForCurrentProcess()))
+  if (AttemptFastNotify(*base::CommandLine::ForCurrentProcess()))
     return 0;
 
   // Load and launch the chrome dll. *Everything* happens inside.
   VLOG(1) << "About to load main DLL.";
   MainDllLoader* loader = MakeMainDllLoader();
   int rc = loader->Launch(instance);
   loader->RelaunchChromeBrowserWithNewCommandLineIfNeeded();
   delete loader;
   return rc;
 }