DesktopSessionAgent now hosts the video capturer and provides necessary plumbing to drive it via an…

remoting/host/desktop_session_agent_win.cc

Index: remoting/host/desktop_session_agent_win.cc
diff --git a/remoting/host/desktop_session_agent_win.cc b/remoting/host/desktop_session_agent_win.cc
index ff771e56c873e17559e33a8fbabb1296867fc962..e336c13855bf55144bb455bab486d777e6030893 100644
--- a/remoting/host/desktop_session_agent_win.cc
+++ b/remoting/host/desktop_session_agent_win.cc
@@ -25,11 +25,12 @@ class DesktopSessionAgentWin : public DesktopSessionAgent {
  public:
   DesktopSessionAgentWin(
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
-      scoped_refptr<AutoThreadTaskRunner> io_task_runner);
+      scoped_refptr<AutoThreadTaskRunner> io_task_runner,
+      scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner);
   virtual ~DesktopSessionAgentWin();
 
  protected:
-  virtual bool DoCreateNetworkChannel(
+  virtual bool CreateChannelForNetworkProcess(
       IPC::PlatformFileForTransit* client_out,
       scoped_ptr<IPC::ChannelProxy>* server_out) OVERRIDE;
 
@@ -39,14 +40,17 @@ class DesktopSessionAgentWin : public DesktopSessionAgent {
 
 DesktopSessionAgentWin::DesktopSessionAgentWin(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
-    scoped_refptr<AutoThreadTaskRunner> io_task_runner)
-    : DesktopSessionAgent(caller_task_runner, io_task_runner) {
+    scoped_refptr<AutoThreadTaskRunner> io_task_runner,
+    scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner)
+    : DesktopSessionAgent(caller_task_runner,
+                          io_task_runner,
+                          video_capture_task_runner) {
 }
 
 DesktopSessionAgentWin::~DesktopSessionAgentWin() {
 }
 
-bool DesktopSessionAgentWin::DoCreateNetworkChannel(
+bool DesktopSessionAgentWin::CreateChannelForNetworkProcess(
     IPC::PlatformFileForTransit* client_out,
     scoped_ptr<IPC::ChannelProxy>* server_out) {
   // Generate a unique name for the channel.
@@ -80,11 +84,12 @@ bool DesktopSessionAgentWin::DoCreateNetworkChannel(
 }
 
 // static
-scoped_ptr<DesktopSessionAgent> DesktopSessionAgent::Create(
+scoped_refptr<DesktopSessionAgent> DesktopSessionAgent::Create(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
-    scoped_refptr<AutoThreadTaskRunner> io_task_runner) {
-  return scoped_ptr<DesktopSessionAgent>(new DesktopSessionAgentWin(
-      caller_task_runner, io_task_runner));
+    scoped_refptr<AutoThreadTaskRunner> io_task_runner,
+    scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner) {
+  return scoped_refptr<DesktopSessionAgent>(new DesktopSessionAgentWin(
+      caller_task_runner, io_task_runner, video_capture_task_runner));
 }
 
 }  // namespace remoting