diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-26 18:00:29 +0000 |
| commit | 319dab11b1ee7e16b8f4089261f47d353aa8a466 (patch) | |
| tree | 6c8db94b10f88a7e8711cd3b06ed8ab6fda39070 /remoting/host | |
| parent | 4993f34cdf20cf9e1124656164e2c647efba6989 (diff) | |
| download | chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.zip chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.gz chromium_src-319dab11b1ee7e16b8f4089261f47d353aa8a466.tar.bz2 | |
Added control channel in ChromotingConnection. Moved channel
initialization to OnInitiate() in JingleChromotingConnection.
BUG=None
TEST=Unittests.
Review URL: http://codereview.chromium.org/4055002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63908 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/client_connection_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/remoting/host/client_connection_unittest.cc b/remoting/host/client_connection_unittest.cc index 317d7fa..fcb3df3 100644 --- a/remoting/host/client_connection_unittest.cc +++ b/remoting/host/client_connection_unittest.cc @@ -30,7 +30,7 @@ class ClientConnectionTest : public testing::Test { viewer_ = new ClientConnection(&message_loop_, &handler_); viewer_->Init(connection_); EXPECT_CALL(handler_, OnConnectionOpened(viewer_.get())); - connection_->get_state_change_callback()->Run( + connection_->state_change_callback()->Run( ChromotingConnection::CONNECTED); message_loop_.RunAllPending(); } @@ -62,11 +62,11 @@ TEST_F(ClientConnectionTest, SendUpdateStream) { TEST_F(ClientConnectionTest, StateChange) { EXPECT_CALL(handler_, OnConnectionClosed(viewer_.get())); - connection_->get_state_change_callback()->Run(ChromotingConnection::CLOSED); + connection_->state_change_callback()->Run(ChromotingConnection::CLOSED); message_loop_.RunAllPending(); EXPECT_CALL(handler_, OnConnectionFailed(viewer_.get())); - connection_->get_state_change_callback()->Run(ChromotingConnection::FAILED); + connection_->state_change_callback()->Run(ChromotingConnection::FAILED); message_loop_.RunAllPending(); } |