Switch remoting/protocol to new callbacks

remoting/protocol/jingle_session_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop_proxy.h"
 #include "base/path_service.h"
 #include "base/time.h"
@@ skipping 103 matching lines @@
  public:
   JingleSessionTest()
       : message_loop_(talk_base::Thread::Current()) {
   }
 
   // Helper method to copy to set value of client_connection_.
   void SetHostSession(Session* session) {
     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);
   }
 
  protected:
   virtual void SetUp() {
   }
 
   virtual void TearDown() {
@@ skipping 135 matching lines @@
       }
       // Expect that the connection will be closed eventually.
       EXPECT_CALL(client_connection_callback_,
                   OnStateChange(Session::CLOSED))
           .Times(1);
     }
 
     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);
 
     return RunMessageLoopWithTimeout(TestTimeouts::action_max_timeout_ms());
   }
 
   static void DoNothing() { }
 
   JingleThreadMessageLoop message_loop_;
 
@@ skipping 398 matching lines @@
         .Times(1);
     EXPECT_CALL(client_connection_callback_,
                 OnStateChange(Session::CLOSED))
         .Times(1)
         .WillOnce(InvokeWithoutArgs(&QuitCurrentThread));
   }
 
   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()));
 }
 
 // Verify that we can connect two endpoints.
 TEST_F(JingleSessionTest, Connect) {
   CreateServerPair();
   ASSERT_TRUE(InitiateConnection(kTestSharedSecret));
 }
 
@@ skipping 75 matching lines @@
   ASSERT_TRUE(tester->WaitFinished());
   LOG(INFO) << "Time for 500k bytes "
             << tester->GetElapsedTime().InMilliseconds() << " ms.";
 
   // Connections must be closed while |tester| still exists.
   CloseSessions();
 }
 
 }  // namespace protocol
 }  // namespace remoting