Index: remoting/host/desktop_session_agent_posix.cc |
diff --git a/remoting/host/desktop_session_agent_posix.cc b/remoting/host/desktop_session_agent_posix.cc |
index 445bc16fafd920d2e7d704cd0a1fb4c3dbc21e8d..485ac400ea51844ce00c247ab2e75a30d8e4e950 100644 |
--- a/remoting/host/desktop_session_agent_posix.cc |
+++ b/remoting/host/desktop_session_agent_posix.cc |
@@ -27,7 +27,7 @@ class DesktopSessionAgentPosix : public DesktopSessionAgent { |
virtual ~DesktopSessionAgentPosix(); |
protected: |
- virtual bool DoCreateNetworkChannel( |
+ virtual bool CreateChannelForNetworkProcess( |
IPC::PlatformFileForTransit* client_out, |
scoped_ptr<IPC::ChannelProxy>* server_out) OVERRIDE; |
@@ -44,7 +44,7 @@ DesktopSessionAgentPosix::DesktopSessionAgentPosix( |
DesktopSessionAgentPosix::~DesktopSessionAgentPosix() { |
} |
-bool DesktopSessionAgentPosix::DoCreateNetworkChannel( |
+bool DesktopSessionAgentPosix::CreateChannelForNetworkProcess( |
IPC::PlatformFileForTransit* client_out, |
scoped_ptr<IPC::ChannelProxy>* server_out) { |
// Create a socket pair. |
@@ -83,11 +83,12 @@ bool DesktopSessionAgentPosix::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 DesktopSessionAgentPosix( |
- caller_task_runner, io_task_runner)); |
+ scoped_refptr<AutoThreadTaskRunner> io_task_runner, |
+ scoped_refptr<AutoThreadTaskRunner> video_capture_task_runner) { |
+ return scoped_refptr<DesktopSessionAgent>(new DesktopSessionAgentPosix( |
+ caller_task_runner, io_task_runner, video_capture_task_runner)); |
} |
} // namespace remoting |