Cleanup: Use base::CommandLine in remoting/

remoting/host/host_main.cc

 // Copyright (c) 2013 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.
 //
 // This file implements the common entry point shared by all Chromoting Host
 // processes.
 
 #include "remoting/host/host_main.h"
 
 #include <string>
@@ skipping 68 matching lines @@
   "  --version                - Prints the host version and exits.\n";
 
 void Usage(const base::FilePath& program_name) {
   printf(kUsageMessage, program_name.MaybeAsASCII().c_str());
 }
 
 #if defined(OS_WIN)
 
 // Runs the binary specified by the command line, elevated.
 int RunElevated() {
-  const CommandLine::SwitchMap& switches =
-      CommandLine::ForCurrentProcess()->GetSwitches();
-  CommandLine::StringVector args = CommandLine::ForCurrentProcess()->GetArgs();
+  const base::CommandLine::SwitchMap& switches =
+      base::CommandLine::ForCurrentProcess()->GetSwitches();
+  base::CommandLine::StringVector args =
+      base::CommandLine::ForCurrentProcess()->GetArgs();
 
   // Create the child process command line by copying switches from the current
   // command line.
-  CommandLine command_line(CommandLine::NO_PROGRAM);
-  for (CommandLine::SwitchMap::const_iterator i = switches.begin();
+  base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
+  for (base::CommandLine::SwitchMap::const_iterator i = switches.begin();
        i != switches.end(); ++i) {
     if (i->first != kElevateSwitchName)
       command_line.AppendSwitchNative(i->first, i->second);
   }
-  for (CommandLine::StringVector::const_iterator i = args.begin();
+  for (base::CommandLine::StringVector::const_iterator i = args.begin();
        i != args.end(); ++i) {
     command_line.AppendArgNative(*i);
   }
 
   // Get the name of the binary to launch.
   base::FilePath binary =
-      CommandLine::ForCurrentProcess()->GetSwitchValuePath(kElevateSwitchName);
-  CommandLine::StringType parameters = command_line.GetCommandLineString();
+      base::CommandLine::ForCurrentProcess()->GetSwitchValuePath(
+          kElevateSwitchName);
+  base::CommandLine::StringType parameters =
+      command_line.GetCommandLineString();
 
   // Launch the child process requesting elevation.
   SHELLEXECUTEINFO info;
   memset(&info, 0, sizeof(info));
   info.cbSize = sizeof(info);
   info.lpVerb = L"runas";
   info.lpFile = binary.value().c_str();
   info.lpParameters = parameters.c_str();
   info.nShow = SW_SHOWNORMAL;
 
@@ skipping 30 matching lines @@
 }
 
 }  // namespace
 
 int HostMain(int argc, char** argv) {
 #if defined(OS_MACOSX)
   // Needed so we don't leak objects when threads are created.
   base::mac::ScopedNSAutoreleasePool pool;
 #endif
 
-  CommandLine::Init(argc, argv);
+  base::CommandLine::Init(argc, argv);
 
   // Initialize Breakpad as early as possible. On Mac the command-line needs to
   // be initialized first, so that the preference for crash-reporting can be
   // looked up in the config file.
 #if defined(REMOTING_ENABLE_BREAKPAD)
   if (IsUsageStatsAllowed()) {
     InitializeCrashReporting();
   }
 #endif  // defined(REMOTING_ENABLE_BREAKPAD)
 
   // This object instance is required by Chrome code (for example,
   // LazyInstance, MessageLoop).
   base::AtExitManager exit_manager;
 
   // Enable debug logs.
   InitHostLogging();
 
   // Register and initialize common controls.
 #if defined(OS_WIN)
   INITCOMMONCONTROLSEX info;
   info.dwSize = sizeof(info);
   info.dwICC = ICC_STANDARD_CLASSES;
   InitCommonControlsEx(&info);
 #endif  // defined(OS_WIN)
 
   // Parse the command line.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
+  const base::CommandLine* command_line =
+      base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(kHelpSwitchName) ||
       command_line->HasSwitch(kQuestionSwitchName)) {
     Usage(command_line->GetProgram());
     return kSuccessExitCode;
   }
 
   if (command_line->HasSwitch(kVersionSwitchName)) {
     printf("%s\n", STRINGIZE(VERSION));
     return kSuccessExitCode;
   }
@@ skipping 28 matching lines @@
   if (exit_code == kUsageExitCode) {
     Usage(command_line->GetProgram());
   }
 
   remoting::UnloadResources();
 
   return exit_code;
 }
 
 }  // namespace remoting