Add abstract interfaces for the transport layer.

remoting/protocol/pepper_session.h

 // Copyright (c) 2012 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 <list>
 #include <map>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/timer.h"
 #include "crypto/rsa_private_key.h"
 #include "net/base/completion_callback.h"
 #include "remoting/protocol/jingle_messages.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_config.h"
+#include "remoting/protocol/transport.h"
 
 namespace net {
 class Socket;
 class StreamSocket;
 }  // namespace net
 
 namespace remoting {
 
 class IqRequest;
 
 namespace protocol {
 
 class Authenticator;
-class PepperChannel;
 class PepperSessionManager;
 
 // Implements the protocol::Session interface using the Pepper P2P
 // Transport API. Created by PepperSessionManager for incoming and
 // outgoing connections.
-class PepperSession : public Session {
+class PepperSession : public Session,
+                      public Transport::EventHandler {
  public:
   virtual ~PepperSession();
 
   // Session interface.
   virtual void SetStateChangeCallback(
       const StateChangeCallback& callback) OVERRIDE;
   virtual void SetRouteChangeCallback(
       const RouteChangeCallback& 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 void CancelChannelCreation(const std::string& name) OVERRIDE;
   virtual const std::string& jid() OVERRIDE;
   virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
   virtual const SessionConfig& config() OVERRIDE;
   virtual void set_config(const SessionConfig& config) OVERRIDE;
   virtual void Close() OVERRIDE;
 
+  // Transport::EventHandler interface.
+  virtual void OnTransportCandidate(
+      Transport* transport,
+      const cricket::Candidate& candidate) OVERRIDE;
+  virtual void OnTransportDeleted(Transport* transport) OVERRIDE;
+
  private:
   friend class PepperSessionManager;
   friend class PepperStreamChannel;
 
-  typedef std::map<std::string, PepperChannel*> ChannelsMap;
+  typedef std::map<std::string, Transport*> ChannelsMap;
 
   explicit PepperSession(PepperSessionManager* session_manager);
 
   // Start cs connection by sending session-initiate message.
   void StartConnection(const std::string& peer_jid,
                        scoped_ptr<Authenticator> authenticator,
                        scoped_ptr<CandidateSessionConfig> config,
                        const StateChangeCallback& state_change_callback);
 
   // Handler for session-initiate response.
@@ skipping 12 matching lines @@
   void OnSessionInfo(const JingleMessage& message, JingleMessageReply* reply);
   void OnTerminate(const JingleMessage& message, JingleMessageReply* reply);
   void ProcessTransportInfo(const JingleMessage& message);
 
   // Called from OnAccept() to initialize session config.
   bool InitializeConfigFromDescription(const ContentDescription* description);
 
   void ProcessAuthenticationStep();
   void OnSessionInfoResponse(const buzz::XmlElement* response);
 
-  // Called by PepperChannel.
-  void AddLocalCandidate(const cricket::Candidate& candidate);
-  void OnDeleteChannel(PepperChannel* channel);
-
   void SendTransportInfo();
   void OnTransportInfoResponse(const buzz::XmlElement* response);
 
   // 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_;
@@ skipping 18 matching lines @@
   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_