summaryrefslogtreecommitdiffstats
path: root/remoting/host/ipc_desktop_environment_unittest.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-11-03 14:31:00 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-03 22:31:50 +0000
commitec77d854a19b75584ca9c0ccc243366d1b776f34 (patch)
tree627e437407303741858632e29cc0c0a817c2717a /remoting/host/ipc_desktop_environment_unittest.cc
parent9024e5102a47625ff857d54bf69007e1806672a1 (diff)
downloadchromium_src-ec77d854a19b75584ca9c0ccc243366d1b776f34.zip
chromium_src-ec77d854a19b75584ca9c0ccc243366d1b776f34.tar.gz
chromium_src-ec77d854a19b75584ca9c0ccc243366d1b776f34.tar.bz2
Fix chromoting host to report error when closing connection.
Previously host would often close session without reporting the reason to the client. Added two new error codes and updated the host to report session termination reason when appropriate. BUG=548261 Committed: https://crrev.com/09750216bef8bc9f2953e4eee9f66801bf034fa4 Cr-Commit-Position: refs/heads/master@{#357215} Review URL: https://codereview.chromium.org/1430503002 Cr-Commit-Position: refs/heads/master@{#357652}
Diffstat (limited to 'remoting/host/ipc_desktop_environment_unittest.cc')
-rw-r--r--remoting/host/ipc_desktop_environment_unittest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 9bfb621..1de0f29 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -275,9 +275,9 @@ void IpcDesktopEnvironmentTest::SetUp() {
EXPECT_CALL(client_session_control_, client_jid())
.Times(AnyNumber())
.WillRepeatedly(ReturnRef(client_jid_));
- EXPECT_CALL(client_session_control_, DisconnectSession())
+ EXPECT_CALL(client_session_control_, DisconnectSession(_))
.Times(AnyNumber())
- .WillRepeatedly(Invoke(
+ .WillRepeatedly(InvokeWithoutArgs(
this, &IpcDesktopEnvironmentTest::DeleteDesktopEnvironment));
EXPECT_CALL(client_session_control_, OnLocalMouseMoved(_))
.Times(0);