Switch remoting/protocol to new callbacks

remoting/protocol/protocol_test_client.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 "build/build_config.h"
 
 #if !defined(OS_WIN)
 extern "C" {
 #include <unistd.h>
 }
@@ skipping 278 matching lines @@
 void ProtocolTestClient::OnJidChange(const std::string& full_jid) {
   local_jid_ = full_jid;
 }
 
 void ProtocolTestClient::OnSessionManagerInitialized() {
   if (host_jid_ != "") {
     ProtocolTestConnection* connection = new ProtocolTestConnection(this);
     connection->Init(session_manager_->Connect(
         host_jid_, "", kDummyAuthToken,
         CandidateSessionConfig::CreateDefault(),
-        NewCallback(connection, &ProtocolTestConnection::OnStateChange)));
+        base::Bind(&ProtocolTestConnection::OnStateChange, connection)));
     connections_.push_back(make_scoped_refptr(connection));
   }
 }
 
 void ProtocolTestClient::OnIncomingSession(
     Session* session,
     SessionManager::IncomingSessionResponse* response) {
   std::cerr << "Accepting connection from " << session->jid() << std::endl;
 
   session->set_config(SessionConfig::GetDefault());
   *response = SessionManager::ACCEPT;
 
   ProtocolTestConnection* test_connection = new ProtocolTestConnection(this);
   session->SetStateChangeCallback(
-      NewCallback(test_connection, &ProtocolTestConnection::OnStateChange));
+      base::Bind(&ProtocolTestConnection::OnStateChange, test_connection));
   test_connection->Init(session);
   base::AutoLock auto_lock(connections_lock_);
   connections_.push_back(make_scoped_refptr(test_connection));
 }
 
 }  // namespace protocol
 }  // namespace remoting
 
 using remoting::protocol::ProtocolTestClient;
 
@@ skipping 34 matching lines @@
   std::string auth_service("oauth2");
   if (cmd_line->HasSwitch("auth_service"))
     auth_service = cmd_line->GetSwitchValueASCII("auth_service");
 
   scoped_refptr<ProtocolTestClient> client(new ProtocolTestClient());
 
   client->Run(username, auth_token, host_jid, auth_service);
 
   return 0;
 }