Switch remoting/protocol to new callbacks

remoting/protocol/pepper_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_PEPPER_SESSION_H_
 #define REMOTING_PROTOCOL_PEPPER_SESSION_H_
 
 #include <map>
 #include <string>
 
@@ skipping 28 matching lines @@
 class SocketWrapper;
 
 // Implements the protocol::Session interface using the Pepper P2P
 // Transport API. Created by PepperSessionManager for incoming and
 // outgoing connections.
 class PepperSession : public Session {
  public:
   virtual ~PepperSession();
 
   // Session interface.
-  virtual void SetStateChangeCallback(StateChangeCallback* callback) OVERRIDE;
+  virtual void SetStateChangeCallback(
+      const StateChangeCallback& callback) OVERRIDE;
   virtual Error error() OVERRIDE;
   virtual void CreateStreamChannel(
       const std::string& name,
       const StreamChannelCallback& callback) OVERRIDE;
   virtual void CreateDatagramChannel(
       const std::string& name,
       const DatagramChannelCallback& callback) OVERRIDE;
   virtual net::Socket* control_channel() OVERRIDE;
   virtual net::Socket* event_channel() OVERRIDE;
   virtual const std::string& jid() OVERRIDE;
@@ skipping 14 matching lines @@
 
   typedef std::map<std::string, PepperChannel*> ChannelsMap;
 
   PepperSession(PepperSessionManager* session_manager);
 
   // Start cs connection by sending session-initiate message.
   void StartConnection(const std::string& peer_jid,
                        const std::string& peer_public_key,
                        const std::string& client_token,
                        CandidateSessionConfig* config,
-                       Session::StateChangeCallback* state_change_callback);
+                       const StateChangeCallback& state_change_callback);
 
   // Handler for session-initiate response.
   void OnSessionInitiateResponse(const buzz::XmlElement* response);
 
   // Called when an error occurs. Sets |error_| and closes the session.
   void OnError(Error error);
 
   // Called by PepperSessionManager on incoming |message|. Must fill
   // in |reply|.
   void OnIncomingMessage(const JingleMessage& message,
@@ skipping 22 matching lines @@
   // Close all the channels and terminate the session.
   void CloseInternal(bool failed);
 
   // Sets |state_| to |new_state| and calls state change callback.
   void SetState(State new_state);
 
   PepperSessionManager* session_manager_;
   std::string peer_jid_;
   std::string peer_public_key_;
   scoped_ptr<CandidateSessionConfig> candidate_config_;
-  scoped_ptr<StateChangeCallback> state_change_callback_;
+  StateChangeCallback state_change_callback_;
 
   std::string session_id_;
   State state_;
   Error error_;
 
   std::string remote_cert_;
   SessionConfig config_;
 
   std::string shared_secret_;
   std::string initiator_token_;
   std::string receiver_token_;
 
   scoped_ptr<IqRequest> initiate_request_;
 
   ChannelsMap channels_;
 
   scoped_ptr<net::Socket> control_channel_socket_;
   scoped_ptr<net::Socket> event_channel_socket_;
 
   base::OneShotTimer<PepperSession> transport_infos_timer_;
   std::list<cricket::Candidate> pending_candidates_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_PEPPER_SESSION_H_