diff options
author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 14:55:37 +0000 |
---|---|---|
committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 14:55:37 +0000 |
commit | a5d181f50c2543ac837623a0b619a6a487913fa5 (patch) | |
tree | 7ba018efcd8bbfb51478b5dd1bf0b5ed66bddf36 /remoting/host/chromoting_host_unittest.cc | |
parent | 48b6601cb7a02a3cd6ff74c8f9d5f222ddc2304f (diff) | |
download | chromium_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/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index b15fb8d..3f7768f 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -33,6 +33,7 @@ using ::remoting::protocol::SessionConfig; using testing::_; using testing::AnyNumber; +using testing::AtMost; using testing::AtLeast; using testing::CreateFunctor; using testing::DeleteArg; @@ -283,13 +284,17 @@ class ChromotingHostTest : public testing::Test { EXPECT_CALL(*desktop_environment, CreateAudioCapturerPtr()) .Times(0); EXPECT_CALL(*desktop_environment, CreateInputInjectorPtr()) - .Times(AnyNumber()) - .WillRepeatedly(Invoke(this, &ChromotingHostTest::CreateInputInjector)); + .Times(AtMost(1)) + .WillOnce(Invoke(this, &ChromotingHostTest::CreateInputInjector)); EXPECT_CALL(*desktop_environment, CreateScreenControlsPtr()) - .Times(AnyNumber()); + .Times(AtMost(1)); EXPECT_CALL(*desktop_environment, CreateVideoCapturerPtr()) - .Times(AnyNumber()) - .WillRepeatedly(Invoke(this, &ChromotingHostTest::CreateVideoCapturer)); + .Times(AtMost(1)) + .WillOnce(Invoke(this, &ChromotingHostTest::CreateVideoCapturer)); + EXPECT_CALL(*desktop_environment, GetCapabilities()) + .Times(AtMost(1)); + EXPECT_CALL(*desktop_environment, SetCapabilities(_)) + .Times(AtMost(1)); return desktop_environment; } |