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

chrome/browser/browser_shutdown.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/browser_shutdown.h"
 
 #include <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 205 matching lines @@
 
   if (restart_last_session) {
 #if !defined(OS_CHROMEOS)
     // Make sure to relaunch the browser with the original command line plus
     // the Restore Last Session flag. Note that Chrome can be launched (ie.
     // through ShellExecute on Windows) with a switch argument terminator at
     // the end (double dash, as described in b/1366444) plus a URL,
     // which prevents us from appending to the command line directly (issue
     // 46182). We therefore use GetSwitches to copy the command line (it stops
     // at the switch argument terminator).
-    CommandLine old_cl(*CommandLine::ForCurrentProcess());
-    scoped_ptr<CommandLine> new_cl(new CommandLine(old_cl.GetProgram()));
-    std::map<std::string, CommandLine::StringType> switches =
+    base::CommandLine old_cl(*base::CommandLine::ForCurrentProcess());
+    scoped_ptr<base::CommandLine> new_cl(
+        new base::CommandLine(old_cl.GetProgram()));
+    std::map<std::string, base::CommandLine::StringType> switches =
         old_cl.GetSwitches();
     // Remove the switches that shouldn't persist across restart.
     about_flags::RemoveFlagsSwitches(&switches);
     switches::RemoveSwitchesForAutostart(&switches);
     // Append the old switches to the new command line.
-    for (std::map<std::string, CommandLine::StringType>::const_iterator i =
-        switches.begin(); i != switches.end(); ++i) {
-      CommandLine::StringType switch_value = i->second;
+    for (
+        std::map<std::string, base::CommandLine::StringType>::const_iterator i =
+            switches.begin();
+        i != switches.end(); ++i) {
+      base::CommandLine::StringType switch_value = i->second;
       if (!switch_value.empty())
         new_cl->AppendSwitchNative(i->first, i->second);
       else
         new_cl->AppendSwitch(i->first);
     }
 
 #if defined(OS_WIN)
     upgrade_util::RelaunchChromeWithMode(*new_cl.get(), g_relaunch_mode);
 #else
     upgrade_util::RelaunchChromeBrowser(*new_cl.get());
@@ skipping 84 matching lines @@
 
 void SetTryingToQuit(bool quitting) {
   g_trying_to_quit = quitting;
 }
 
 bool IsTryingToQuit() {
   return g_trying_to_quit;
 }
 
 }  // namespace browser_shutdown