Switch remoting/protocol to new callbacks

There is still some code that uses old callbacks (particularly unittests) - I will convert them in a separate CL.

BUG=None
TEST=Unittests

Review URL: http://codereview.chromium.org/8116021

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104440 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 35e4181..ef5eb78 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()));
 }