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

remoting/host/desktop_process.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/desktop_process.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "remoting/base/auto_thread.h"
 #include "remoting/base/auto_thread_task_runner.h"
 #include "remoting/host/chromoting_messages.h"
 #include "remoting/host/desktop_session_agent.h"
 
-const char kIoThreadName[] = "I/O thread";
-
 namespace remoting {
 
 DesktopProcess::DesktopProcess(
     scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
     const std::string& daemon_channel_name)
     : caller_task_runner_(caller_task_runner),
       daemon_channel_name_(daemon_channel_name) {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(MessageLoop::current()->type(), MessageLoop::TYPE_UI);
 }
@@ skipping 20 matching lines @@
   VLOG(1) << "IPC: desktop <- daemon (" << peer_pid << ")";
 
   NOTIMPLEMENTED();
 }
 
 void DesktopProcess::OnChannelError() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   // Shutdown the desktop process.
   daemon_channel_.reset();
-  desktop_agent_.reset();
+  desktop_agent_->Stop();
+  desktop_agent_ = NULL;
   caller_task_runner_ = NULL;

[Wez, 2012/11/16 23:37:31]

Do you really need to NULL |caller_task_runner_| here?

[alexeypa (please no reviews), 2012/11/19 21:46:25]

Yes. This is the way to stop the process.

[Wez, 2012/11/20 07:05:39]

But if you NULL it then caller_task_runner_->BelongsToCurrentThread checks will
crash, so I'd generally been trying to avoid that in classes.  On the face if it
it looks OK in this case, though.

 }
 
 bool DesktopProcess::Start() {
   DCHECK(caller_task_runner_->BelongsToCurrentThread());
 
   // Launch the I/O thread.
   scoped_refptr<AutoThreadTaskRunner> io_task_runner =
-      AutoThread::CreateWithType(kIoThreadName, caller_task_runner_,
+      AutoThread::CreateWithType("I/O thread", caller_task_runner_,
                                  MessageLoop::TYPE_IO);
 
+  // Launch the video capture thread.
+  scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner =
+      AutoThread::Create("Video capture thread", caller_task_runner_);
+
   // Create a desktop agent.
   desktop_agent_ = DesktopSessionAgent::Create(caller_task_runner_,
-                                               io_task_runner);
+                                               io_task_runner,
+                                               video_capture_task_runner);
 
   // Start the agent and create an IPC channel to talk to it. It is safe to
   // use base::Unretained(this) here because the message loop below will run
   // until |desktop_agent_| is completely destroyed.
   IPC::PlatformFileForTransit desktop_pipe;
   if (!desktop_agent_->Start(base::Bind(&DesktopProcess::OnChannelError,
                                         base::Unretained(this)),
                              &desktop_pipe)) {
-    desktop_agent_.reset();
+    desktop_agent_ = NULL;

[Wez, 2012/11/16 23:37:31]

Is there definitely nothing in Stop() that needs doing in this case?

[alexeypa (please no reviews), 2012/11/19 21:46:25]

It is all done by DesktopProcess::OnChannelError().

[Wez, 2012/11/20 07:05:39]

Could you do without NULLing |desktop_agent_| here, as well, since it's NULLed
in OnChannelError?

[alexeypa (please no reviews), 2012/11/20 20:15:17]

No, I can't. DesktopProcess::OnChannelError may not be called at all.

I added "caller_task_runner_ = NULL;" here as well just to make sure that the
message loop will be properly destroyed.

     return false;
   }
 
   // Connect to the daemon.
   daemon_channel_.reset(new IPC::ChannelProxy(daemon_channel_name_,
                                               IPC::Channel::MODE_CLIENT,
                                               this,
                                               io_task_runner));
 
   // Pass |desktop_pipe| to the daemon.
   daemon_channel_->Send(
       new ChromotingDesktopDaemonMsg_DesktopAttached(desktop_pipe));
 
   return true;
 }
 
 void DesktopProcess::OnCrash(const std::string& function_name,
                              const std::string& file_name,
                              const int& line_number) {
   // The daemon requested us to crash the process.
   CHECK(false);
 }
 
 } // namespace remoting