The Chromoting service should not start automatically unless it was configured from the webapp to d…

remoting/host/host_service_win.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/host_service_win.h"
 
 #include <windows.h>
@@ skipping 94 matching lines @@
   service_name_(UTF8ToUTF16(kWindowsServiceName)),
   service_status_handle_(0),
   shutting_down_(false),
   stopped_event_(true, false) {
 }
 
 HostService::~HostService() {
 }
 
 void HostService::AddWtsConsoleObserver(WtsConsoleObserver* observer) {
+  DCHECK(message_loop_->message_loop_proxy()->BelongsToCurrentThread());
+
   console_observers_.AddObserver(observer);
 }
 
 void HostService::RemoveWtsConsoleObserver(WtsConsoleObserver* observer) {
+  DCHECK(message_loop_->message_loop_proxy()->BelongsToCurrentThread());
+
   console_observers_.RemoveObserver(observer);
 }
 
+void HostService::RequestRemoveWtsConsoleObserver(
+    WtsConsoleObserver* observer) {
+  DCHECK(message_loop_->message_loop_proxy()->BelongsToCurrentThread());
+
+  observer->OnSessionDetached();
+  console_observers_.RemoveObserver(observer);
+
+  // Stop the service if there are no more observers.
+  if (!console_observers_.might_have_observers()) {
+    message_loop_->PostTask(FROM_HERE, MessageLoop::QuitClosure());
+  }
+}
+
 void HostService::OnSessionChange() {
   // WTSGetActiveConsoleSessionId is a very cheap API. It basically reads
   // a single value from shared memory. Therefore it is better to check if
   // the console session is still the same every time a session change
   // notification event is posted. This also takes care of coalescing multiple
   // events into one since we look at the latest state.
   uint32 console_session_id = kInvalidSession;
   if (!shutting_down_) {
     console_session_id = WTSGetActiveConsoleSessionId();
   }
@@ skipping 218 matching lines @@
 
 int HostService::Run() {
   return (this->*run_routine_)();
 }
 
 void HostService::RunMessageLoop() {
   // 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";
     shutting_down_ = true;
     stopped_event_.Signal();
     return;
   }
 
-  WtsSessionProcessLauncher launcher(this, host_binary_, &io_thread);
+  WtsSessionProcessLauncher launcher(this, host_binary_,
+                                     message_loop_->message_loop_proxy(),
+                                     io_thread.message_loop_proxy());
 
   // Run the service.
   message_loop_->Run();
 
   // Clean up the observers by emulating detaching from the console.
   shutting_down_ = true;
   OnSessionChange();
 
   // Release the control handler.
   stopped_event_.Signal();
@@ skipping 211 matching lines @@
   }
 
   remoting::HostService* service = remoting::HostService::GetInstance();
   if (!service->InitWithCommandLine(command_line)) {
     usage(argv[0]);
     return kUsageExitCode;
   }
 
   return service->Run();
 }