Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(621)

Unified Diff: remoting/host/client_session_unittest.cc

Issue 1085703003: Use standard ICE in Chromoting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix crash on memory bots Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/session_manager_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/client_session_unittest.cc
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index 5d94591c495aa9f71c1d2884399b9692a8477551..8af1e6c465be9207712b8b8611a112e210fd0b0f 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(_));
« no previous file with comments | « remoting/host/chromoting_host_unittest.cc ('k') | remoting/host/session_manager_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698