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

remoting/host/wts_session_process_launcher_win.h

 // 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.
 
 #ifndef REMOTING_HOST_WTS_SESSION_PROCESS_LAUNCHER_WIN_H_
 #define REMOTING_HOST_WTS_SESSION_PROCESS_LAUNCHER_WIN_H_
 
 #include <windows.h>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/compiler_specific.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/process.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "base/win/scoped_handle.h"
 #include "base/win/object_watcher.h"
 #include "ipc/ipc_channel.h"
 
 #include "remoting/host/wts_console_observer_win.h"
 
 namespace base {
-
-class Thread;
-
+class MessageLoopProxy;
 } // namespace base
 
 namespace IPC {
-
 class ChannelProxy;
 class Message;
-
 } // namespace IPC
 
 namespace remoting {
 
 class SasInjector;
 class WtsConsoleMonitor;
 
 class WtsSessionProcessLauncher
     : public base::win::ObjectWatcher::Delegate,
       public IPC::Channel::Listener,
       public WtsConsoleObserver {
  public:
-  // Constructs a WtsSessionProcessLauncher object. |monitor| and |io_thread|
-  // must outlive this object. |host_binary| is the name of the executable to
-  // be launched in the console session.
-  WtsSessionProcessLauncher(WtsConsoleMonitor* monitor,
-                            const FilePath& host_binary,
-                            base::Thread* io_thread);
+  // Constructs a WtsSessionProcessLauncher object. |host_binary| is the name of
+  // the executable to be launched in the console session. All interaction with
+  // |monitor| should happen on the same tthread as |main_message_loop| is.

[Wez, 2012/04/11 01:01:23]

typo: tthread

[Wez, 2012/04/11 01:01:23]

reword: "All interaction ... should happen on |main_message_loop|."

[alexeypa (please no reviews), 2012/04/11 17:39:39]

Done.

+  // |ipc_message_loop| has to be an I/O message loop.
+  WtsSessionProcessLauncher(
+      WtsConsoleMonitor* monitor,
+      const FilePath& host_binary,
+      scoped_refptr<base::MessageLoopProxy> main_message_loop,
+      scoped_refptr<base::MessageLoopProxy> ipc_message_loop);
 
   virtual ~WtsSessionProcessLauncher();
 
   // base::win::ObjectWatcher::Delegate implementation.
   virtual void OnObjectSignaled(HANDLE object) OVERRIDE;
 
   // IPC::Channel::Listener implementation.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WtsConsoleObserver implementation.
@@ skipping 15 matching lines @@
 
   // Time of the last launch attempt.
   base::Time launch_time_;
 
   // Current backoff delay.
   base::TimeDelta launch_backoff_;
 
   // Timer used to schedule the next attempt to launch the process.
   base::OneShotTimer<WtsSessionProcessLauncher> timer_;
 
-  // The I/O thread hosts the Chromoting IPC channel and any other code
-  // requiring an I/O message loop.
-  base::Thread* io_thread_;
+  // The main service message loop.
+  scoped_refptr<base::MessageLoopProxy> main_message_loop_;
+
+  // Message loop used by the IPC channel.
+  scoped_refptr<base::MessageLoopProxy> ipc_message_loop_;
 
   // This pointer is used to unsubscribe from session attach and detach events.
   WtsConsoleMonitor* monitor_;
 
   // Impersonation token that has the SE_TCB_NAME privilege enabled.
   base::win::ScopedHandle privileged_token_;
 
   // The handle of the process injected into the console session.
   base::Process process_;
 
@@ skipping 18 matching lines @@
   scoped_ptr<IPC::ChannelProxy> chromoting_channel_;
 
   scoped_ptr<SasInjector> sas_injector_;
 
   DISALLOW_COPY_AND_ASSIGN(WtsSessionProcessLauncher);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_WTS_SESSION_PROCESS_LAUNCHER_WIN_H_