Removing --host-binary parameter in preparation to the coming me2me host refactoring.

remoting/host/win/host_service.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.
 //
 // This file implements the Windows service controlling Me2Me host processes
 // running within user sessions.
 
 #include "remoting/host/win/host_service.h"
 
 #include <windows.h>
 #include <wtsapi32.h>
 #include <stdio.h>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/wrapped_window_proc.h"
 #include "remoting/base/breakpad.h"
 #include "remoting/base/scoped_sc_handle_win.h"
 #include "remoting/base/stoppable.h"
 #include "remoting/host/branding.h"
 #include "remoting/host/usage_stats_consent.h"
@@ skipping 11 matching lines @@
 const wchar_t kSessionNotificationWindowClass[] =
   L"Chromoting_SessionNotificationWindow";
 
 // Command line actions and switches:
 // "run" sumply runs the service as usual.
 const wchar_t kRunActionName[] = L"run";
 
 // "--console" runs the service interactively for debugging purposes.
 const char kConsoleSwitchName[] = "console";
 
-// "--host-binary" specifies the host binary to run in console session.
-const char kHostBinarySwitchName[] = "host-binary";
-
 // "--help" or "--?" prints the usage message.
 const char kHelpSwitchName[] = "help";
 const char kQuestionSwitchName[] = "?";
 
 const char kUsageMessage[] =
   "\n"
   "Usage: %s [action] [options]\n"
   "\n"
   "Actions:\n"
   "  run           - Run the service (default if no action was specified).\n"
   "\n"
   "Options:\n"
   "  --console     - Run the service interactively for debugging purposes.\n"
-  "  --host-binary - Specifies the host binary to run.\n"
   "  --help, --?   - Print this message.\n";
 
 // Exit codes:
 const int kSuccessExitCode = 0;
 const int kUsageExitCode = 1;
 const int kErrorExitCode = 2;
 
 void usage(const char* program_name) {
   fprintf(stderr, kUsageMessage, program_name);
 }
@@ skipping 86 matching lines @@
       LOG(ERROR) << "Invalid command line: more than one action requested.";
       return false;
     }
     if (args[0] != kRunActionName) {
       LOG(ERROR) << "Invalid command line: invalid action specified: "
                  << args[0];
       return false;
     }
   }
 
-  if (command_line->HasSwitch(kHostBinarySwitchName)) {
-    host_binary_ = command_line->GetSwitchValuePath(kHostBinarySwitchName);
-  } else {
-    LOG(ERROR) << "Invalid command line: --" << kHostBinarySwitchName
-               << " is required.";
-    return false;
-  }
-
   // Run interactively if needed.
   if (run_routine_ == &HostService::RunAsService &&
       command_line->HasSwitch(kConsoleSwitchName)) {
     run_routine_ = &HostService::RunInConsole;
   }
 
   return true;
 }
 
 int HostService::Run() {
   return (this->*run_routine_)();
 }
 
 void HostService::RunMessageLoop(MessageLoop* message_loop) {
   // Launch the I/O thread.
   base::Thread io_thread(kIoThreadName);
   base::Thread::Options io_thread_options(MessageLoop::TYPE_IO, 0);
   if (!io_thread.StartWithOptions(io_thread_options)) {
     LOG(FATAL) << "Failed to start the I/O thread";
     stopped_event_.Signal();
     return;
   }
 
   // Create the session process launcher.
   launcher_.reset(new WtsSessionProcessLauncher(
       base::Bind(&HostService::OnLauncherShutdown, base::Unretained(this)),
       this,
-      host_binary_,
       main_task_runner_,
       io_thread.message_loop_proxy()));
 
   // Run the service.
   message_loop->Run();
 
   // Release the control handler.
   stopped_event_.Signal();
 }
 
@@ skipping 213 matching lines @@
   }
 
   remoting::HostService* service = remoting::HostService::GetInstance();
   if (!service->InitWithCommandLine(command_line)) {
     usage(argv[0]);
     return kUsageExitCode;
   }
 
   return service->Run();
 }