diff options
author | sergeyu <sergeyu@chromium.org> | 2015-04-23 10:44:11 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 17:44:28 +0000 |
commit | da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1 (patch) | |
tree | 86d9897125f1ef05a9095b8ca49fe2997b59d8e2 /remoting/host/chromoting_host_unittest.cc | |
parent | 0df00e0661defe6707ad888dd9146aa25bfed63a (diff) | |
download | chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.zip chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.gz chromium_src-da3ba0c9e7d2f0ae81f4d89097a6df56b3ec0df1.tar.bz2 |
Revert of Use standard ICE in Chromoting. (patchset #7 id:160001 of https://codereview.chromium.org/1085703003/)
Reason for revert:
This change did cause test failure: http://build.chromium.org/p/chromium.memory.fyi/builders/Chromium%20Mac%20%28valgrind%29%282%29/builds/34169/ (the link in the first revert was incorrect)
Original issue's description:
> 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}
TBR=rmsousa@chromium.org,wez@chromium.org,dcaiafa@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473758
Review URL: https://codereview.chromium.org/1089253005
Cr-Commit-Position: refs/heads/master@{#326570}
Diffstat (limited to 'remoting/host/chromoting_host_unittest.cc')
-rw-r--r-- | remoting/host/chromoting_host_unittest.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index b7d6d65..19efc25 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -108,7 +108,9 @@ class ChromotingHostTest : public testing::Test { session_jid1_ = "user@domain/rest-of-jid"; session_config2_ = SessionConfig::ForTest(); session_jid2_ = "user2@domain/rest-of-jid"; + session_unowned_config1_ = SessionConfig::ForTest(); session_unowned_jid1_ = "user3@doman/rest-of-jid"; + session_unowned_config2_ = SessionConfig::ForTest(); session_unowned_jid2_ = "user4@doman/rest-of-jid"; EXPECT_CALL(*session1_, jid()) @@ -130,9 +132,9 @@ class ChromotingHostTest : public testing::Test { .Times(AnyNumber()) .WillRepeatedly(SaveArg<0>(&session_unowned2_event_handler_)); EXPECT_CALL(*session1_, config()) - .WillRepeatedly(ReturnRef(*session_config1_)); + .WillRepeatedly(ReturnRef(session_config1_)); EXPECT_CALL(*session2_, config()) - .WillRepeatedly(ReturnRef(*session_config2_)); + .WillRepeatedly(ReturnRef(session_config2_)); owned_connection1_.reset(new MockConnectionToClient(session1_, &host_stub1_)); @@ -419,7 +421,7 @@ class ChromotingHostTest : public testing::Test { ClientSession* client1_; std::string session_jid1_; MockSession* session1_; // Owned by |connection_|. - scoped_ptr<SessionConfig> session_config1_; + SessionConfig session_config1_; MockVideoStub video_stub1_; MockClientStub client_stub1_; MockHostStub host_stub1_; @@ -428,13 +430,15 @@ class ChromotingHostTest : public testing::Test { ClientSession* client2_; std::string session_jid2_; MockSession* session2_; // Owned by |connection2_|. - scoped_ptr<SessionConfig> session_config2_; + SessionConfig session_config2_; MockVideoStub video_stub2_; MockClientStub client_stub2_; MockHostStub host_stub2_; scoped_ptr<MockSession> session_unowned1_; // Not owned by a connection. + SessionConfig session_unowned_config1_; std::string session_unowned_jid1_; scoped_ptr<MockSession> session_unowned2_; // Not owned by a connection. + SessionConfig session_unowned_config2_; std::string session_unowned_jid2_; protocol::Session::EventHandler* session_unowned1_event_handler_; protocol::Session::EventHandler* session_unowned2_event_handler_; @@ -595,7 +599,7 @@ TEST_F(ChromotingHostTest, IncomingSessionAccepted) { ExpectHostAndSessionManagerStart(); EXPECT_CALL(*session_unowned1_, candidate_config()).WillOnce(Return( default_candidate_config_.get())); - EXPECT_CALL(*session_unowned1_, set_config_ptr(_)); + EXPECT_CALL(*session_unowned1_, set_config(_)); EXPECT_CALL(*session_unowned1_, Close()).WillOnce(InvokeWithoutArgs( this, &ChromotingHostTest::NotifyConnectionClosed1)); EXPECT_CALL(host_status_observer_, OnAccessDenied(_)); @@ -616,7 +620,7 @@ TEST_F(ChromotingHostTest, LoginBackOffUponConnection) { ExpectHostAndSessionManagerStart(); EXPECT_CALL(*session_unowned1_, candidate_config()).WillOnce( Return(default_candidate_config_.get())); - EXPECT_CALL(*session_unowned1_, set_config_ptr(_)); + EXPECT_CALL(*session_unowned1_, set_config(_)); EXPECT_CALL(*session_unowned1_, Close()).WillOnce( InvokeWithoutArgs(this, &ChromotingHostTest::NotifyConnectionClosed1)); EXPECT_CALL(host_status_observer_, OnAccessDenied(_)); @@ -642,13 +646,13 @@ TEST_F(ChromotingHostTest, LoginBackOffUponAuthenticating) { Expectation start = ExpectHostAndSessionManagerStart(); EXPECT_CALL(*session_unowned1_, candidate_config()).WillOnce( Return(default_candidate_config_.get())); - EXPECT_CALL(*session_unowned1_, set_config_ptr(_)); + EXPECT_CALL(*session_unowned1_, set_config(_)); EXPECT_CALL(*session_unowned1_, Close()).WillOnce( InvokeWithoutArgs(this, &ChromotingHostTest::NotifyConnectionClosed1)); EXPECT_CALL(*session_unowned2_, candidate_config()).WillOnce( Return(default_candidate_config_.get())); - EXPECT_CALL(*session_unowned2_, set_config_ptr(_)); + EXPECT_CALL(*session_unowned2_, set_config(_)); EXPECT_CALL(*session_unowned2_, Close()).WillOnce( InvokeWithoutArgs(this, &ChromotingHostTest::NotifyConnectionClosed2)); |