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

remoting/host/ipc_desktop_environment_unittest.cc

 // Copyright (c) 2013 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/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 33 matching lines @@
 
 // Receives messages sent from the network process to the daemon.
 class FakeDaemonSender : public IPC::Sender {
  public:
   FakeDaemonSender() {}
   virtual ~FakeDaemonSender() {}
 
   // IPC::Sender implementation.
   virtual bool Send(IPC::Message* message) OVERRIDE;
 
-  MOCK_METHOD3(ConnectTerminal, void(int, const DesktopSessionParams&, bool));
+  MOCK_METHOD3(ConnectTerminal, void(int, const ScreenResolution&, bool));
   MOCK_METHOD1(DisconnectTerminal, void(int));
 
  private:
   void OnMessageReceived(const IPC::Message& message);
 
   DISALLOW_COPY_AND_ASSIGN(FakeDaemonSender);
 };
 
 // Receives messages sent from the desktop process to the daemon.
 class MockDaemonListener : public IPC::Listener {
@@ skipping 45 matching lines @@
 }  // namespace
 
 class IpcDesktopEnvironmentTest : public testing::Test {
  public:
   IpcDesktopEnvironmentTest();
   virtual ~IpcDesktopEnvironmentTest();
 
   virtual void SetUp() OVERRIDE;
 
   void ConnectTerminal(int terminal_id,
-                       const DesktopSessionParams& params,
+                       const ScreenResolution& resolution,
                        bool virtual_terminal);
   void DisconnectTerminal(int terminal_id);
 
   // Creates a DesktopEnvironment with a fake media::ScreenCapturer, to mock
   // DesktopEnvironmentFactory::Create().
   DesktopEnvironment* CreateDesktopEnvironment();
 
   // Creates a dummy EventExecutor, to mock
   // DesktopEnvironment::CreateEventExecutor().
   EventExecutor* CreateEventExecutor();
@@ skipping 126 matching lines @@
   event_executor_ =
       desktop_environment_->CreateEventExecutor(task_runner_, task_runner_);
 
   // Create the screen capturer.
   video_capturer_ =
       desktop_environment_->CreateVideoCapturer(task_runner_, task_runner_);
 }
 
 void IpcDesktopEnvironmentTest::ConnectTerminal(
     int terminal_id,
-    const DesktopSessionParams& params,
+    const ScreenResolution& resolution,
     bool virtual_terminal) {
   EXPECT_NE(terminal_id_, terminal_id);
 
   terminal_id_ = terminal_id;
   CreateDesktopProcess();
 }
 
 void IpcDesktopEnvironmentTest::DisconnectTerminal(int terminal_id) {
   EXPECT_EQ(terminal_id_, terminal_id);
 
@@ skipping 368 matching lines @@
   event.set_x(0);
   event.set_y(0);
   event_executor_->InjectMouseEvent(event);
 
   task_runner_ = NULL;
   io_task_runner_ = NULL;
   main_run_loop_.Run();
 }
 
 }  // namespace remoting