Pass the initial screen resolution and curtain flag to the daemon.

BUG=137696


Review URL: https://chromiumcodereview.appspot.com/12387104

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186926 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 16 insertions, 7 deletions

diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index e440403..6c3844a 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -54,7 +54,10 @@ class MockDaemonProcess : public DaemonProcess {
   virtual ~MockDaemonProcess();
 
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
-      int terminal_id) OVERRIDE;
+      int terminal_id,
+      const DesktopSessionParams& params,
+      bool virtual_terminal) OVERRIDE;
+
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void SendToNetwork(IPC::Message* message) OVERRIDE;
 
@@ -89,7 +92,9 @@ MockDaemonProcess::~MockDaemonProcess() {
 }
 
 scoped_ptr<DesktopSession> MockDaemonProcess::DoCreateDesktopSession(
-    int terminal_id) {
+    int terminal_id,
+    const DesktopSessionParams& params,
+    bool virtual_terminal) {
   return scoped_ptr<DesktopSession>(DoCreateDesktopSessionPtr(terminal_id));
 }
 
@@ -210,9 +215,10 @@ TEST_F(DaemonProcessTest, OpenClose) {
   StartDaemonProcess();
 
   int id = terminal_id_++;
+  DesktopSessionParams params;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
@@ -230,9 +236,10 @@ TEST_F(DaemonProcessTest, CallCloseDesktopSession) {
   StartDaemonProcess();
 
   int id = terminal_id_++;
+  DesktopSessionParams params;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
@@ -253,9 +260,10 @@ TEST_F(DaemonProcessTest, DoubleDisconnectTerminal) {
   StartDaemonProcess();
 
   int id = terminal_id_++;
+  DesktopSessionParams params;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
@@ -304,14 +312,15 @@ TEST_F(DaemonProcessTest, InvalidConnectTerminal) {
   StartDaemonProcess();
 
   int id = terminal_id_++;
+  DesktopSessionParams params;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
   EXPECT_TRUE(desktop_sessions().empty());
   EXPECT_EQ(0, terminal_id_);
 }