Cleanup: Use base::CommandLine in remoting/

remoting/host/setup/daemon_controller_delegate_linux.cc

 // Copyright 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.
 
 #include "remoting/host/setup/daemon_controller_delegate_linux.h"
 
 #include <unistd.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 67 matching lines @@
   // PATH, don't do it as root.
   if (getuid() == 0) {
     LOG(ERROR) << "Refusing to run script as root.";
     return false;
   }
   base::FilePath script_path;
   if (!GetScriptPath(&script_path)) {
     LOG(ERROR) << "GetScriptPath() failed.";
     return false;
   }
-  CommandLine command_line(script_path);
+  base::CommandLine command_line(script_path);
   for (unsigned int i = 0; i < args.size(); ++i) {
     command_line.AppendArg(args[i]);
   }
   base::ProcessHandle process_handle;
 
   // Redirect the child's stdout to the parent's stderr. In the case where this
   // parent process is a Native Messaging host, its stdout is used to send
   // messages to the web-app.
   base::FileHandleMappingVector fds_to_remap;
   fds_to_remap.push_back(std::pair<int, int>(STDERR_FILENO, STDOUT_FILENO));
@@ skipping 26 matching lines @@
 }
 
 DaemonControllerDelegateLinux::~DaemonControllerDelegateLinux() {
 }
 
 DaemonController::State DaemonControllerDelegateLinux::GetState() {
   base::FilePath script_path;
   if (!GetScriptPath(&script_path)) {
     return DaemonController::STATE_NOT_IMPLEMENTED;
   }
-  CommandLine command_line(script_path);
+  base::CommandLine command_line(script_path);
   command_line.AppendArg("--get-status");
 
   std::string status;
   int exit_code = 0;
   bool result =
       base::GetAppOutputWithExitCode(command_line, &status, &exit_code);
   if (!result) {
     // TODO(jamiewalch): When we have a good story for installing, return
     // NOT_INSTALLED rather than NOT_IMPLEMENTED (the former suppresses
     // the relevant UI in the web-app).
@@ skipping 29 matching lines @@
     JsonHostConfig config(GetConfigPath());
     if (config.Read()) {
       std::string value;
       if (config.GetString(kHostIdConfigPath, &value)) {
         result->SetString(kHostIdConfigPath, value);
       }
       if (config.GetString(kXmppLoginConfigPath, &value)) {
         result->SetString(kXmppLoginConfigPath, value);
       }
     } else {
-      result.reset(); // Return NULL in case of error.
+      result.reset();  // Return NULL in case of error.
     }
   }
 
   return result.Pass();
 }
 
 void DaemonControllerDelegateLinux::InstallHost(
     const DaemonController::CompletionCallback& done) {
   NOTREACHED();
 }
@@ skipping 79 matching lines @@
 
 void DaemonControllerDelegateLinux::SetWindow(void* window_handle) {
   // noop
 }
 
 std::string DaemonControllerDelegateLinux::GetVersion() {
   base::FilePath script_path;
   if (!GetScriptPath(&script_path)) {
     return std::string();
   }
-  CommandLine command_line(script_path);
+  base::CommandLine command_line(script_path);
   command_line.AppendArg("--host-version");
 
   std::string version;
   int exit_code = 0;
   int result =
       base::GetAppOutputWithExitCode(command_line, &version, &exit_code);
   if (!result || exit_code != 0) {
     LOG(ERROR) << "Failed to run \"" << command_line.GetCommandLineString()
                << "\". Exit code: " << exit_code;
     return std::string();
@@ skipping 19 matching lines @@
   return consent;
 }
 
 scoped_refptr<DaemonController> DaemonController::Create() {
   scoped_ptr<DaemonController::Delegate> delegate(
       new DaemonControllerDelegateLinux());
   return new DaemonController(delegate.Pass());
 }
 
 }  // namespace remoting