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

chrome/browser/browser_process_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.
 
 #include "chrome/browser/browser_process_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 147 matching lines @@
 static const int kEndSessionTimeoutSeconds = 10;
 #endif
 
 using content::BrowserThread;
 using content::ChildProcessSecurityPolicy;
 using content::PluginService;
 using content::ResourceDispatcherHost;
 
 BrowserProcessImpl::BrowserProcessImpl(
     base::SequencedTaskRunner* local_state_task_runner,
-    const CommandLine& command_line)
+    const base::CommandLine& command_line)
     : created_watchdog_thread_(false),
       created_browser_policy_connector_(false),
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_service_(false),
       module_ref_count_(0),
       did_start_(false),
       download_status_updater_(new DownloadStatusUpdater),
@@ skipping 679 matching lines @@
   return prerender_tracker_.get();
 }
 
 component_updater::ComponentUpdateService*
 BrowserProcessImpl::component_updater() {
   if (!component_updater_.get()) {
     if (!BrowserThread::CurrentlyOn(BrowserThread::UI))
       return NULL;
     component_updater::Configurator* configurator =
         component_updater::MakeChromeComponentUpdaterConfigurator(
-            CommandLine::ForCurrentProcess(),
+            base::CommandLine::ForCurrentProcess(),
             io_thread()->system_url_request_context_getter());
     // Creating the component updater does not do anything, components
     // need to be registered and Start() needs to be called.
     component_updater_.reset(ComponentUpdateServiceFactory(configurator));
   }
   return component_updater_.get();
 }
 
 CRLSetFetcher* BrowserProcessImpl::crl_set_fetcher() {
   if (!crl_set_fetcher_.get())
@@ skipping 116 matching lines @@
 #endif
 
 #if defined(ENABLE_PLUGINS)
   PluginService* plugin_service = PluginService::GetInstance();
   plugin_service->SetFilter(ChromePluginServiceFilter::GetInstance());
   plugin_service->StartWatchingPlugins();
 
 #if defined(OS_POSIX)
   // Also find plugins in a user-specific plugins dir,
   // e.g. ~/.config/chromium/Plugins.
-  const CommandLine& cmd_line = *CommandLine::ForCurrentProcess();
+  const base::CommandLine& cmd_line = *base::CommandLine::ForCurrentProcess();
   if (!cmd_line.HasSwitch(switches::kDisablePluginsDiscovery)) {
     base::FilePath user_data_dir;
     if (PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
       plugin_service->AddExtraPluginDir(user_data_dir.Append("Plugins"));
   }
 #endif
 
   // Triggers initialization of the singleton instance on UI thread.
   PluginFinder::GetInstance()->Init();
 
 #if defined(ENABLE_PLUGIN_INSTALLATION)
   DCHECK(!plugins_resource_service_.get());
   plugins_resource_service_ = new PluginsResourceService(local_state());
   plugins_resource_service_->Init();
 #endif
 #endif  // defined(ENABLE_PLUGINS)
 
-  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  const base::CommandLine& command_line =
+      *base::CommandLine::ForCurrentProcess();
   if (!command_line.HasSwitch(switches::kDisableWebResources)) {
     DCHECK(!promo_resource_service_.get());
     promo_resource_service_ = new PromoResourceService;
     promo_resource_service_->StartAfterDelay();
   }
 
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   storage_monitor::StorageMonitor::Create();
 #endif
 
@@ skipping 18 matching lines @@
   DCHECK(notification_ui_manager_.get() == NULL);
   notification_ui_manager_.reset(NotificationUIManager::Create(local_state()));
   created_notification_ui_manager_ = true;
 #endif
 }
 
 void BrowserProcessImpl::CreateBackgroundModeManager() {
 #if defined(ENABLE_BACKGROUND)
   DCHECK(background_mode_manager_.get() == NULL);
   background_mode_manager_.reset(
-      new BackgroundModeManager(CommandLine::ForCurrentProcess(),
+      new BackgroundModeManager(base::CommandLine::ForCurrentProcess(),
                                 &profile_manager()->GetProfileInfoCache()));
 #endif
 }
 
 void BrowserProcessImpl::CreateStatusTray() {
   DCHECK(status_tray_.get() == NULL);
   status_tray_.reset(StatusTray::Create());
 }
 
 void BrowserProcessImpl::CreatePrintPreviewDialogController() {
@@ skipping 83 matching lines @@
   return chrome::GetTotalBrowserCount() == 0 && chrome::WillKeepAlive() &&
          upgrade_util::IsUpdatePendingRestart();
 }
 
 // Switches to add when auto-restarting Chrome.
 const char* const kSwitchesToAddOnAutorestart[] = {
   switches::kNoStartupWindow
 };
 
 void BrowserProcessImpl::RestartBackgroundInstance() {
-  CommandLine* old_cl = CommandLine::ForCurrentProcess();
-  scoped_ptr<CommandLine> new_cl(new CommandLine(old_cl->GetProgram()));
+  base::CommandLine* old_cl = base::CommandLine::ForCurrentProcess();
+  scoped_ptr<base::CommandLine> new_cl(
+      new base::CommandLine(old_cl->GetProgram()));
 
-  std::map<std::string, CommandLine::StringType> switches =
+  std::map<std::string, base::CommandLine::StringType> switches =
       old_cl->GetSwitches();
 
   switches::RemoveSwitchesForAutostart(&switches);
 
   // Append the rest of the switches (along with their values, if any)
   // 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.length() > 0) {
         new_cl->AppendSwitchNative(i->first, i->second);
       } else {
         new_cl->AppendSwitch(i->first);
       }
   }
 
   // Ensure that our desired switches are set on the new process.
   for (size_t i = 0; i < arraysize(kSwitchesToAddOnAutorestart); ++i) {
     if (!new_cl->HasSwitch(kSwitchesToAddOnAutorestart[i]))
       new_cl->AppendSwitch(kSwitchesToAddOnAutorestart[i]);
   }
 
   DLOG(WARNING) << "Shutting down current instance of the browser.";
   chrome::AttemptExit();
 
   // Transfer ownership to Upgrade.
   upgrade_util::SetNewCommandLine(new_cl.release());
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)