summaryrefslogtreecommitdiffstats
path: root/remoting/host/client_session_unittest.cc
diff options
context:
space:
mode:
authoralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 14:55:37 +0000
committeralexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-19 14:55:37 +0000
commita5d181f50c2543ac837623a0b619a6a487913fa5 (patch)
tree7ba018efcd8bbfb51478b5dd1bf0b5ed66bddf36 /remoting/host/client_session_unittest.cc
parent48b6601cb7a02a3cd6ff74c8f9d5f222ddc2304f (diff)
downloadchromium_src-a5d181f50c2543ac837623a0b619a6a487913fa5.zip
chromium_src-a5d181f50c2543ac837623a0b619a6a487913fa5.tar.gz
chromium_src-a5d181f50c2543ac837623a0b619a6a487913fa5.tar.bz2
Set the initial resolution of an RDP session to the client screen resolution if it is available.
Changes in this CL: - The version of the control channel is increased to 3. This allows the host and client to tell if the peer supports capabilities negotiation or not. - The client and host negotiate supported capabilities by sending each other a list of the supported capabilities. Capabilities supported by both client and host are assumed to be enabled. - The client plugin and webapp negotiate the list of capabilities supported by the client. The webapp has the final word. - The DesktopEnvironment interface was extended to provide the list of all supported capabilities and receive the results of negotiation with the client. - Added the 'sendInitialResolution' capability. When it is enabled the client sends its screen resolution to the host once the connection has been established. - DesktopSessionProxy now waits for the client screen resolution when the 'sendInitialResolution' capability is enabled. BUG=230893 Review URL: https://chromiumcodereview.appspot.com/13932020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/client_session_unittest.cc')
-rw-r--r--remoting/host/client_session_unittest.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index e12758e..a5c687b 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -26,6 +26,7 @@ using protocol::SessionConfig;
using testing::_;
using testing::AnyNumber;
+using testing::AtMost;
using testing::DeleteArg;
using testing::DoAll;
using testing::Expectation;
@@ -190,9 +191,13 @@ DesktopEnvironment* ClientSessionTest::CreateDesktopEnvironment() {
EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr())
.WillOnce(Invoke(this, &ClientSessionTest::CreateInputInjector));
EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr())
- .Times(1);
+ .Times(AtMost(1));
EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr())
.WillOnce(Invoke(this, &ClientSessionTest::CreateVideoCapturer));
+ EXPECT_CALL(*desktop_environment, GetCapabilities())
+ .Times(AtMost(1));
+ EXPECT_CALL(*desktop_environment, SetCapabilities(_))
+ .Times(AtMost(1));
return desktop_environment;
}