Making DesktopEnvironment a factory class used by ClientSession to create audio/video capturers and…

remoting/host/ipc_desktop_environment.h

Index: remoting/host/ipc_desktop_environment.h
diff --git a/remoting/host/ipc_desktop_environment.h b/remoting/host/ipc_desktop_environment.h
index 53b5c0fb75208fc701653f796c6ce0cc4587f826..23d78df75818a774e1c1b7d25767374ba768b005 100644
--- a/remoting/host/ipc_desktop_environment.h
+++ b/remoting/host/ipc_desktop_environment.h
@@ -5,11 +5,13 @@
 #ifndef REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
 #define REMOTING_HOST_IPC_DESKTOP_ENVIRONMENT_H_
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "ipc/ipc_platform_file.h"
+#include "base/memory/weak_ptr.h"
 #include "remoting/host/desktop_environment.h"
 
 namespace base {
@@ -25,34 +27,42 @@ class DesktopSessionProxy;
 // a helper process and talking to that process via IPC.
 class IpcDesktopEnvironment : public DesktopEnvironment {
  public:
-  // |desktop_session_connector| is used to bind the IpcDesktopEnvironment to
-  // a desktop session, to be notified with a new IPC channel every time
-  // the desktop process is changed. |desktop_session_connector| must outlive
-  // |this|.  |client| specifies the client session owning |this|.
+  // |desktop_session_connector| is used to bind DesktopSessionProxy to
+  // a desktop session, to be notified every time the desktop process is
+  // restarted.
   IpcDesktopEnvironment(
-      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> network_task_runner,
-      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
-      DesktopSessionConnector* desktop_session_connector,
-      scoped_refptr<DesktopSessionProxy> desktop_session_proxy);
+      scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
+      const std::string& client_jid,
+      const base::Closure& disconnect_callback,
+      base::WeakPtr<DesktopSessionConnector> desktop_session_connector);
   virtual ~IpcDesktopEnvironment();
 
-  virtual void Start(
-      scoped_ptr<protocol::ClipboardStub> client_clipboard,
-      const std::string& client_jid,
-      const base::Closure& disconnect_callback) OVERRIDE;
+  // DesktopEnvironment implementation.
+  virtual scoped_ptr<AudioCapturer> CreateAudioCapturer(
+      scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner) OVERRIDE;
+  virtual scoped_ptr<EventExecutor> CreateEventExecutor(
+      scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) OVERRIDE;
+  virtual scoped_ptr<VideoFrameCapturer> CreateVideoCapturer(
+      scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner,
+      scoped_refptr<base::SingleThreadTaskRunner> encode_task_runner) OVERRIDE;
 
  private:
-  // Used for IPC I/O.
-  scoped_refptr<base::SingleThreadTaskRunner> network_task_runner_;
+  // Binds DesktopSessionProxy to a desktop session if it is not bound already.
+  void RegisterDesktopSessionProxy();
 
-  DesktopSessionConnector* desktop_session_connector_;
+  // Task runner on which public methods of this class should be called.
+  scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner_;
 
-  scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
-
-  // True if |this| has been connected to a desktop session.
+  // True if |desktop_session_proxy_| has been connected to a desktop session.
   bool connected_;
 
+  // Used to bind DesktopSessionProxy to a desktop session, to be notified every
+  // time the desktop process is restarted.
+  base::WeakPtr<DesktopSessionConnector> desktop_session_connector_;
+
+  scoped_refptr<DesktopSessionProxy> desktop_session_proxy_;
+
   DISALLOW_COPY_AND_ASSIGN(IpcDesktopEnvironment);
 };