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

Unified Diff: remoting/protocol/jingle_session_unittest.cc

Issue 8116021: Switch remoting/protocol to new callbacks (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 9 years, 2 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/message_reader.h » ('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 35e418118988f7e22c2d024d0249cc51f3e369ab..ef5eb783f42acbe5814eb25a200c565614b89ef8 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -121,8 +121,8 @@ class JingleSessionTest : public testing::Test {
DCHECK(session);
host_session_.reset(session);
host_session_->SetStateChangeCallback(
- NewCallback(&host_connection_callback_,
- &MockSessionCallback::OnStateChange));
+ base::Bind(&MockSessionCallback::OnStateChange,
+ base::Unretained(&host_connection_callback_)));
session->set_config(SessionConfig::GetDefault());
session->set_shared_secret(kTestSharedSecret);
@@ -278,8 +278,8 @@ class JingleSessionTest : public testing::Test {
client_session_.reset(client_server_->Connect(
kHostJid, kTestHostPublicKey, kTestToken,
CandidateSessionConfig::CreateDefault(),
- NewCallback(&client_connection_callback_,
- &MockSessionCallback::OnStateChange)));
+ base::Bind(&MockSessionCallback::OnStateChange,
+ base::Unretained(&client_connection_callback_))));
client_session_->set_shared_secret(shared_secret);
@@ -698,8 +698,8 @@ TEST_F(JingleSessionTest, RejectConnection) {
client_session_.reset(client_server_->Connect(
kHostJid, kTestHostPublicKey, kTestToken,
CandidateSessionConfig::CreateDefault(),
- NewCallback(&client_connection_callback_,
- &MockSessionCallback::OnStateChange)));
+ base::Bind(&MockSessionCallback::OnStateChange,
+ base::Unretained(&client_connection_callback_))));
ASSERT_TRUE(RunMessageLoopWithTimeout(TestTimeouts::action_max_timeout_ms()));
}
« no previous file with comments | « remoting/protocol/jingle_session_manager.cc ('k') | remoting/protocol/message_reader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698