Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(912)

Unified Diff: remoting/host/daemon_process_unittest.cc

Issue 11231060: [Chromoting] The desktop process now creates a pre-connected pipe and passes (with some help of the… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/daemon_process.cc ('k') | remoting/host/daemon_process_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/daemon_process_unittest.cc
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index 5a8d0450c98f821d86aed546e95cbb6af9fce7d0..e4404037324d904892bd9bc70a4cbef77a498e57 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -5,9 +5,10 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/memory/ref_counted.h"
-#include "base/single_thread_task_runner.h"
+#include "base/process.h"
#include "ipc/ipc_message.h"
#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_platform_file.h"
#include "remoting/base/auto_thread_task_runner.h"
#include "remoting/host/chromoting_messages.h"
#include "remoting/host/daemon_process.h"
@@ -47,8 +48,8 @@ class FakeDesktopSession : public DesktopSession {
class MockDaemonProcess : public DaemonProcess {
public:
MockDaemonProcess(
- scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
+ scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
+ scoped_refptr<AutoThreadTaskRunner> io_task_runner,
const base::Closure& stopped_callback);
virtual ~MockDaemonProcess();
@@ -60,6 +61,9 @@ class MockDaemonProcess : public DaemonProcess {
MOCK_METHOD1(Received, void(const IPC::Message&));
MOCK_METHOD1(Sent, void(const IPC::Message&));
+ MOCK_METHOD3(OnDesktopSessionAgentAttached,
+ bool(int, base::ProcessHandle, IPC::PlatformFileForTransit));
+
MOCK_METHOD1(DoCreateDesktopSessionPtr, DesktopSession*(int));
MOCK_METHOD0(LaunchNetworkProcess, void());
@@ -75,8 +79,8 @@ FakeDesktopSession::~FakeDesktopSession() {
}
MockDaemonProcess::MockDaemonProcess(
- scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> io_task_runner,
+ scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
+ scoped_refptr<AutoThreadTaskRunner> io_task_runner,
const base::Closure& stopped_callback)
: DaemonProcess(caller_task_runner, io_task_runner, stopped_callback) {
}
« no previous file with comments | « remoting/host/daemon_process.cc ('k') | remoting/host/daemon_process_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698