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

remoting/host/wts_session_process_launcher_win.h

Index: remoting/host/wts_session_process_launcher_win.h
diff --git a/remoting/host/wts_session_process_launcher_win.h b/remoting/host/wts_session_process_launcher_win.h
index efcb93a75d01f1b72eeefb70304ec2c0b6e71577..bcb5951ca564715b1acc14b91d7d35aa5579da44 100644
--- a/remoting/host/wts_session_process_launcher_win.h
+++ b/remoting/host/wts_session_process_launcher_win.h
@@ -10,6 +10,8 @@
 #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"
@@ -20,16 +22,12 @@
 #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 {
@@ -42,12 +40,15 @@ class WtsSessionProcessLauncher
       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();
 
@@ -83,9 +84,11 @@ class WtsSessionProcessLauncher
   // 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_;