diff options
| author | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:59:42 +0000 |
|---|---|---|
| committer | jamiewalch@chromium.org <jamiewalch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-30 16:59:42 +0000 |
| commit | ef37f22d76fd0f6b9c2bc0ee0898fb1689920b22 (patch) | |
| tree | 7a0befdf00e338a74397f301d36e183ccca2dbb0 /remoting | |
| parent | 1fd1a5043e4de3078e3e05684a14055474da0d0b (diff) | |
| download | chromium_src-ef37f22d76fd0f6b9c2bc0ee0898fb1689920b22.zip chromium_src-ef37f22d76fd0f6b9c2bc0ee0898fb1689920b22.tar.gz chromium_src-ef37f22d76fd0f6b9c2bc0ee0898fb1689920b22.tar.bz2 | |
Allow for video frames after curtain mode is disabled.
BUG=77909
TEST=ChromotingHostTest.Reconnect passes under Valgrind.
Review URL: http://codereview.chromium.org/6765033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79850 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index f47a98c..8864533 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -249,6 +249,7 @@ TEST_F(ChromotingHostTest, Reconnect) { // connection. { InSequence s; + // Ensure that curtain mode is activated before the first video packet. EXPECT_CALL(*curtain_, EnableCurtainMode(true)) .Times(1); EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _)) @@ -261,6 +262,8 @@ TEST_F(ChromotingHostTest, Reconnect) { .Times(AnyNumber()); EXPECT_CALL(*curtain_, EnableCurtainMode(false)) .Times(1); + EXPECT_CALL(video_stub_, ProcessVideoPacket(_, _)) + .Times(AnyNumber()); } // If Disconnect() is called we can break the main message loop. |