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

Unified Diff: remoting/protocol/jingle_session_unittest.cc

Issue 9005034: Refactor SignalStrategy so that it can be reused for multiple connections. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 8 years, 12 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/protocol/jingle_session_manager.cc ('k') | remoting/protocol/pepper_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/jingle_session_unittest.cc
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index e2bf2d182bc91a262770bc7ee96ee18ddbb42696..d7f2149eeb546c10ae0523b03d5d5600c074a078 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -64,7 +64,7 @@ ACTION_P(QuitThreadOnCounter, counter) {
class MockSessionManagerListener : public SessionManager::Listener {
public:
- MOCK_METHOD0(OnSessionManagerInitialized, void());
+ MOCK_METHOD0(OnSessionManagerReady, void());
MOCK_METHOD2(OnIncomingSession,
void(Session*,
SessionManager::IncomingSessionResponse*));
@@ -127,23 +127,22 @@ class JingleSessionTest : public testing::Test {
FakeSignalStrategy::Connect(host_signal_strategy_.get(),
client_signal_strategy_.get());
- EXPECT_CALL(host_server_listener_, OnSessionManagerInitialized())
+ EXPECT_CALL(host_server_listener_, OnSessionManagerReady())
.Times(1);
host_server_.reset(new JingleSessionManager(
base::MessageLoopProxy::current()));
host_server_->Init(
- kHostJid, host_signal_strategy_.get(), &host_server_listener_, false);
+ host_signal_strategy_.get(), &host_server_listener_, false);
host_server_->set_authenticator_factory(
new FakeHostAuthenticatorFactory(auth_round_trips, auth_action, true));
- EXPECT_CALL(client_server_listener_, OnSessionManagerInitialized())
+ EXPECT_CALL(client_server_listener_, OnSessionManagerReady())
.Times(1);
client_server_.reset(new JingleSessionManager(
base::MessageLoopProxy::current()));
client_server_->Init(
- kClientJid, client_signal_strategy_.get(),
- &client_server_listener_, false);
+ client_signal_strategy_.get(), &client_server_listener_, false);
}
void CloseSessionManager() {
« no previous file with comments | « remoting/protocol/jingle_session_manager.cc ('k') | remoting/protocol/pepper_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698