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

chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.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/ui/aura/chrome_browser_main_extra_parts_aura.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
@@ skipping 45 matching lines @@
     return ui::NativeThemeAura::instance();
 
   return NULL;
 }
 #endif
 
 #if !defined(OS_CHROMEOS) && defined(USE_ASH)
 // Returns the desktop this process was initially launched in.
 chrome::HostDesktopType GetInitialDesktop() {
 #if defined(OS_WIN) && defined(USE_ASH)
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kViewerConnect) ||
       command_line->HasSwitch(switches::kViewerLaunchViaAppId)) {
     return chrome::HOST_DESKTOP_TYPE_ASH;
   }
 #elif defined(OS_LINUX)
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kOpenAsh))
     return chrome::HOST_DESKTOP_TYPE_ASH;
 #endif
 
   return chrome::HOST_DESKTOP_TYPE_NATIVE;
 }
 #endif  // !defined(OS_CHROMEOS) && defined(USE_ASH)
 
 }  // namespace
 
@@ skipping 55 matching lines @@
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
   active_desktop_monitor_.reset();
 
   // aura::Env instance is deleted in BrowserProcessImpl::StartTearDown
   // after the metrics service is deleted.
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
   if (getuid() == 0) {
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    const base::CommandLine& command_line =
+        *base::CommandLine::ForCurrentProcess();
     if (command_line.HasSwitch(switches::kUserDataDir))
       return;
 
     base::string16 title = l10n_util::GetStringFUTF16(
         IDS_REFUSE_TO_RUN_AS_ROOT,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
     base::string16 message = l10n_util::GetStringFUTF16(
         IDS_REFUSE_TO_RUN_AS_ROOT_2,
         l10n_util::GetStringUTF16(IDS_PRODUCT_NAME));
 
     chrome::ShowMessageBox(NULL,
                            title,
                            message,
                            chrome::MESSAGE_BOX_TYPE_WARNING);
 
     // Avoids gpu_process_transport_factory.cc(153)] Check failed:
     // per_compositor_data_.empty() when quit is chosen.
     base::RunLoop().RunUntilIdle();
 
     exit(EXIT_FAILURE);
   }
 }
 #endif