diff options
| author | horo <horo@chromium.org> | 2015-04-22 22:04:07 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 05:04:18 +0000 |
| commit | 372d589d18d9782d8aa2fea2bc6a5d2d37b2ce1b (patch) | |
| tree | d499d199dfb05e8abfd8ba4ef622b00e9fe06f2d /remoting/host/client_session_unittest.cc | |
| parent | 6a5a65873aec5a021cfa3d8fe0db3c4787599a20 (diff) | |
| download | chromium_src-372d589d18d9782d8aa2fea2bc6a5d2d37b2ce1b.zip chromium_src-372d589d18d9782d8aa2fea2bc6a5d2d37b2ce1b.tar.gz chromium_src-372d589d18d9782d8aa2fea2bc6a5d2d37b2ce1b.tar.bz2 | |
Revert of Use standard ICE in Chromoting. (patchset #7 id:160001 of https://codereview.chromium.org/1085703003/)
Reason for revert:
jingle_unittests failure on Mac ASan 64 Tests (1)
https://build.chromium.org/p/chromium.memory/builders/Mac%20ASan%2064%20Tests%20%281%29/builds/805
BUG=480107
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/4b35571a3085aa960dcf5533fb2277d5dcaaf11f
> Cr-Commit-Position: refs/heads/master@{#326435}
TBR=rmsousa@chromium.org,wez@chromium.org,dcaiafa@chromium.org,sergeyu@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=473758
Review URL: https://codereview.chromium.org/1099203005
Cr-Commit-Position: refs/heads/master@{#326458}
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 8af1e6c..5d94591 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. - scoped_ptr<SessionConfig> session_config_; + 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(_)); |