Switch remoting/protocol to new callbacks

remoting/protocol/session.h

 // 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.
 
 #ifndef REMOTING_PROTOCOL_SESSION_H_
 #define REMOTING_PROTOCOL_SESSION_H_
 
 #include <string>
 
 #include "base/callback.h"
@@ skipping 40 matching lines @@
 
   // TODO(sergeyu): Move error codes to a separate file.
   enum Error {
     OK = 0,
     PEER_IS_OFFLINE,
     SESSION_REJECTED,
     INCOMPATIBLE_PROTOCOL,
     CHANNEL_CONNECTION_ERROR,
   };
 
-  typedef Callback1<State>::Type StateChangeCallback;
+  typedef base::Callback<void(State)> StateChangeCallback;
 
   // TODO(sergeyu): Specify connection error code when channel
   // connection fails.
   typedef base::Callback<void(net::StreamSocket*)> StreamChannelCallback;
   typedef base::Callback<void(net::Socket*)> DatagramChannelCallback;
 
   Session() { }
   virtual ~Session() { }
 
   // Set callback that is called when state of the connection is changed.
   // Must be called on the jingle thread only.
-  virtual void SetStateChangeCallback(StateChangeCallback* callback) = 0;
+  virtual void SetStateChangeCallback(const StateChangeCallback& callback) = 0;
 
   // Returns error code for a failed session.
   virtual Error error() = 0;
 
   // Creates new channels for this connection. The specified callback
   // is called when then new channel is created and connected. The
   // callback is called with NULL if connection failed for any reason.
   // Ownership of the channel socket is given to the caller when the
   // callback is called. All channels must be destroyed before the
   // session is destroyed. Can be called only when in CONNECTING or
@@ skipping 41 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_