diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 05:42:58 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-02 05:42:58 +0000 |
commit | 204a9e3b84d001fe3619f14137a6ed4f3ac69b2f (patch) | |
tree | 2f9bee32d4ba68b24839ab97c6ca4ac9f550885c /remoting/protocol/connection_to_client_unittest.cc | |
parent | f804b50923470e810fc57b95d66bb4e99c3de99b (diff) | |
download | chromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.zip chromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.tar.gz chromium_src-204a9e3b84d001fe3619f14137a6ed4f3ac69b2f.tar.bz2 |
Cleanup error handling in the client plugin.
- Added new ErrorCode enum to pass error codes everywhere except between
the webapp and the plugin.
- Signaling timeout when connection now is interpreted as disconnect instead of
error condition (see bug 112739).
- Fixed webapp to properly handle unknown error codes.
BUG=112739
Review URL: http://codereview.chromium.org/9567033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol/connection_to_client_unittest.cc')
-rw-r--r-- | remoting/protocol/connection_to_client_unittest.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc index 0d27fee..0be7389 100644 --- a/remoting/protocol/connection_to_client_unittest.cc +++ b/remoting/protocol/connection_to_client_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -100,9 +100,8 @@ TEST_F(ConnectionToClientTest, StateChange) { session_->state_change_callback().Run(protocol::Session::CLOSED); message_loop_.RunAllPending(); - EXPECT_CALL(handler_, OnConnectionFailed( - viewer_.get(), Session::SESSION_REJECTED)); - session_->set_error(Session::SESSION_REJECTED); + EXPECT_CALL(handler_, OnConnectionFailed(viewer_.get(), SESSION_REJECTED)); + session_->set_error(SESSION_REJECTED); session_->state_change_callback().Run(protocol::Session::FAILED); message_loop_.RunAllPending(); } |