Reworked the plumbing required to pass the client resolution to the desktop resizer.

remoting/host/daemon_process_unittest.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.
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/process.h"
 #include "ipc/ipc_message.h"
@@ skipping 38 matching lines @@
 class MockDaemonProcess : public DaemonProcess {
  public:
   MockDaemonProcess(
       scoped_refptr<AutoThreadTaskRunner> caller_task_runner,
       scoped_refptr<AutoThreadTaskRunner> io_task_runner,
       const base::Closure& stopped_callback);
   virtual ~MockDaemonProcess();
 
   virtual scoped_ptr<DesktopSession> DoCreateDesktopSession(
       int terminal_id,
-      const DesktopSessionParams& params,
+      const ScreenResolution& resolution,
       bool virtual_terminal) OVERRIDE;
 
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void SendToNetwork(IPC::Message* message) OVERRIDE;
 
   MOCK_METHOD1(Received, void(const IPC::Message&));
   MOCK_METHOD1(Sent, void(const IPC::Message&));
 
   MOCK_METHOD3(OnDesktopSessionAgentAttached,
                bool(int, base::ProcessHandle, IPC::PlatformFileForTransit));
@@ skipping 18 matching lines @@
     scoped_refptr<AutoThreadTaskRunner> io_task_runner,
     const base::Closure& stopped_callback)
     : DaemonProcess(caller_task_runner, io_task_runner, stopped_callback) {
 }
 
 MockDaemonProcess::~MockDaemonProcess() {
 }
 
 scoped_ptr<DesktopSession> MockDaemonProcess::DoCreateDesktopSession(
     int terminal_id,
-    const DesktopSessionParams& params,
+    const ScreenResolution& resolution,
     bool virtual_terminal) {
   return scoped_ptr<DesktopSession>(DoCreateDesktopSessionPtr(terminal_id));
 }
 
 bool MockDaemonProcess::OnMessageReceived(const IPC::Message& message) {
   // Notify the mock method.
   Received(message);
 
   // Call the actual handler.
   return DaemonProcess::OnMessageReceived(message);
@@ skipping 113 matching lines @@
 TEST_F(DaemonProcessTest, OpenClose) {
   InSequence s;
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageConfiguration)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageConnectTerminal)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageDisconnectTerminal)));
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageTerminalDisconnected)));
 
   StartDaemonProcess();
 
   int id = terminal_id_++;
-  DesktopSessionParams params;
+  ScreenResolution resolution;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
       ChromotingNetworkHostMsg_DisconnectTerminal(id)));
   EXPECT_TRUE(desktop_sessions().empty());
 }
 
 TEST_F(DaemonProcessTest, CallCloseDesktopSession) {
   InSequence s;
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageConfiguration)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageConnectTerminal)));
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageTerminalDisconnected)));
 
   StartDaemonProcess();
 
   int id = terminal_id_++;
-  DesktopSessionParams params;
+  ScreenResolution resolution;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   daemon_process_->CloseDesktopSession(id);
   EXPECT_TRUE(desktop_sessions().empty());
 }
 
 // Sends two CloseDesktopSession messages and expects the second one to be
 // ignored.
 TEST_F(DaemonProcessTest, DoubleDisconnectTerminal) {
   InSequence s;
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageConfiguration)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageConnectTerminal)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageDisconnectTerminal)));
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageTerminalDisconnected)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageDisconnectTerminal)));
 
   StartDaemonProcess();
 
   int id = terminal_id_++;
-  DesktopSessionParams params;
+  ScreenResolution resolution;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
       ChromotingNetworkHostMsg_DisconnectTerminal(id)));
   EXPECT_TRUE(desktop_sessions().empty());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
       ChromotingNetworkHostMsg_DisconnectTerminal(id)));
   EXPECT_TRUE(desktop_sessions().empty());
@@ skipping 28 matching lines @@
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageConnectTerminal)));
   EXPECT_CALL(*daemon_process_, Received(Message(kMessageConnectTerminal)));
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageCrash)))
       .WillOnce(InvokeWithoutArgs(this,
                                   &DaemonProcessTest::LaunchNetworkProcess));
   EXPECT_CALL(*daemon_process_, Sent(Message(kMessageConfiguration)));
 
   StartDaemonProcess();
 
   int id = terminal_id_++;
-  DesktopSessionParams params;
+  ScreenResolution resolution;
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_EQ(1u, desktop_sessions().size());
   EXPECT_EQ(id, desktop_sessions().front()->id());
 
   EXPECT_TRUE(daemon_process_->OnMessageReceived(
-      ChromotingNetworkHostMsg_ConnectTerminal(id, params, false)));
+      ChromotingNetworkHostMsg_ConnectTerminal(id, resolution, false)));
   EXPECT_TRUE(desktop_sessions().empty());
   EXPECT_EQ(0, terminal_id_);
 }
 
 }  // namespace remoting