diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 19:44:18 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 19:44:18 +0000 |
| commit | 6ac19647f2749d6f14b9558a8df0d5901e092772 (patch) | |
| tree | 76e2aa0075862f3e1678f102d56a7bed83a346f4 /remoting/host/chromoting_host_unittest.cc | |
| parent | 10b32201cdf40fb21b36c51cafe0f8f8c0040954 (diff) | |
| download | chromium_src-6ac19647f2749d6f14b9558a8df0d5901e092772.zip chromium_src-6ac19647f2749d6f14b9558a8df0d5901e092772.tar.gz chromium_src-6ac19647f2749d6f14b9558a8df0d5901e092772.tar.bz2 | |
Always enabled audio in remoting host, disable it for It2Me, minor cleanups.
It's not desired to have audio to be enabled by default in It2Me
case. Specifically because in most cases helper and helpee will have separate
audio channel (e.g. Hangout or Skype) that's connected before the session
is started. Don't enable it until we have UI to toggle audio support.
This change also includes some minor code cleanups.
Review URL: https://chromiumcodereview.appspot.com/10928159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156606 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
| -rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index e75a1cb..a380d8d 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -581,8 +581,6 @@ TEST_F(ChromotingHostTest, IncomingSessionIncompatible) { empty_candidate_config_.get())); EXPECT_CALL(host_status_observer_, OnShutdown()); - host_->set_protocol_config( - protocol::CandidateSessionConfig::CreateDefault().release()); host_->Start(xmpp_login_); protocol::SessionManager::IncomingSessionResponse response = @@ -604,8 +602,6 @@ TEST_F(ChromotingHostTest, IncomingSessionAccepted) { EXPECT_CALL(host_status_observer_, OnAccessDenied(_)); EXPECT_CALL(host_status_observer_, OnShutdown()); - host_->set_protocol_config( - protocol::CandidateSessionConfig::CreateDefault().release()); host_->Start(xmpp_login_); protocol::SessionManager::IncomingSessionResponse response = @@ -627,8 +623,6 @@ TEST_F(ChromotingHostTest, IncomingSessionOverload) { EXPECT_CALL(host_status_observer_, OnAccessDenied(_)); EXPECT_CALL(host_status_observer_, OnShutdown()); - host_->set_protocol_config( - protocol::CandidateSessionConfig::CreateDefault().release()); host_->Start(xmpp_login_); protocol::SessionManager::IncomingSessionResponse response = |