diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-04-23 11:59:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 18:59:56 +0000 |
| commit | b4b0927a2e02d6357f019aeb78576e7a8d84da47 (patch) | |
| tree | 94448c68a7d18547dc542cadb12a1aaa702012f9 /remoting/host/client_session_unittest.cc | |
| parent | 616c2c3cedbe27df60a39ba14c566885af9513d7 (diff) | |
| download | chromium_src-b4b0927a2e02d6357f019aeb78576e7a8d84da47.zip chromium_src-b4b0927a2e02d6357f019aeb78576e7a8d84da47.tar.gz chromium_src-b4b0927a2e02d6357f019aeb78576e7a8d84da47.tar.bz2 | |
Use standard ICE in Chromoting.
Previously we were using legacy, non-standard version of ICE. This
change adds ICE version negotiation and enabled standard ICE by default,
when both peers support it.
BUG=473758
Committed: https://crrev.com/5a5854ee3e1c5760b422f26d31909bfb5dca631f
Cr-Commit-Position: refs/heads/master@{#326560}
Review URL: https://codereview.chromium.org/1085703003
Cr-Commit-Position: refs/heads/master@{#326600}
Diffstat (limited to 'remoting/host/client_session_unittest.cc')
| -rw-r--r-- | remoting/host/client_session_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc index 5d94591..8af1e6c 100644 --- a/remoting/host/client_session_unittest.cc +++ b/remoting/host/client_session_unittest.cc @@ -178,7 +178,7 @@ class ClientSessionTest : public testing::Test { MockClientSessionEventHandler session_event_handler_; // Storage for values to be returned by the protocol::Session mock. - SessionConfig session_config_; + scoped_ptr<SessionConfig> session_config_; const std::string client_jid_; // Stubs returned to |client_session_| components by |connection_|. @@ -224,7 +224,7 @@ void ClientSessionTest::TearDown() { void ClientSessionTest::CreateClientSession() { // Mock protocol::Session APIs called directly by ClientSession. protocol::MockSession* session = new MockSession(); - EXPECT_CALL(*session, config()).WillRepeatedly(ReturnRef(session_config_)); + EXPECT_CALL(*session, config()).WillRepeatedly(ReturnRef(*session_config_)); EXPECT_CALL(*session, jid()).WillRepeatedly(ReturnRef(client_jid_)); EXPECT_CALL(*session, SetEventHandler(_)); |