diff options
author | sergeyu <sergeyu@chromium.org> | 2015-11-24 08:39:55 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-24 16:41:06 +0000 |
commit | 21c899eab46fc830099ba9fb7f32f9ba938a876a (patch) | |
tree | f812de4b08789fabd4fdd55b0ae87e5164edff9e /remoting/host/chromoting_host_unittest.cc | |
parent | cea07ed21c3ad2db7b37a3f26ce34d7dd12efe94 (diff) | |
download | chromium_src-21c899eab46fc830099ba9fb7f32f9ba938a876a.zip chromium_src-21c899eab46fc830099ba9fb7f32f9ba938a876a.tar.gz chromium_src-21c899eab46fc830099ba9fb7f32f9ba938a876a.tar.bz2 |
Simplify It2Me host shutdown
Previously It2Me host was stopped asynchronoulsy, which makes the
shutdown more complicated. Now it's synchronous and is significantly
simpler.
Also removed ChromotingHost::RejectAuthenticatingClient() which is no
longer needed.
Review URL: https://codereview.chromium.org/1458323002
Cr-Commit-Position: refs/heads/master@{#361362}
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 861d116..cd54719 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -270,11 +270,6 @@ class ChromotingHostTest : public testing::Test { NotifyClientSessionClosed(0); } - // Notify |host_| that the authenticating client has been rejected. - void RejectAuthenticatingClient() { - host_->RejectAuthenticatingClient(); - } - // Notify |host_| that a client session has closed. void NotifyClientSessionClosed(int connection_index) { get_client(connection_index)->OnConnectionClosed( @@ -468,21 +463,6 @@ TEST_F(ChromotingHostTest, Connect) { message_loop_.Run(); } -TEST_F(ChromotingHostTest, RejectAuthenticatingClient) { - Expectation start = ExpectHostAndSessionManagerStart(); - EXPECT_CALL(host_status_observer_, OnClientAuthenticated(session_jid1_)) - .WillOnce(InvokeWithoutArgs( - this, &ChromotingHostTest::RejectAuthenticatingClient)); - ExpectClientDisconnected( - 0, true, start, - InvokeWithoutArgs(this, &ChromotingHostTest::ShutdownHost)); - EXPECT_CALL(host_status_observer_, OnShutdown()); - - host_->Start(xmpp_login_); - SimulateClientConnection(0, true, true); - message_loop_.Run(); -} - TEST_F(ChromotingHostTest, AuthenticationFailed) { ExpectHostAndSessionManagerStart(); EXPECT_CALL(host_status_observer_, OnAccessDenied(session_jid1_)) |