Remove event_channel() and control_channel() from Session interface.

remoting/protocol/jingle_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_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/task.h"
 #include "crypto/rsa_private_key.h"
@@ skipping 19 matching lines @@
   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 void CancelChannelCreation(const std::string& name) OVERRIDE;
-  virtual net::Socket* control_channel() OVERRIDE;
-  virtual net::Socket* event_channel() 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 const std::string& initiator_token() OVERRIDE;
   virtual void set_initiator_token(const std::string& initiator_token) OVERRIDE;
   virtual const std::string& receiver_token() OVERRIDE;
   virtual void set_receiver_token(const std::string& receiver_token) OVERRIDE;
   virtual void set_shared_secret(const std::string& secret) OVERRIDE;
   virtual const std::string& shared_secret() OVERRIDE;
@@ skipping 62 matching lines @@
 
   void AddChannelConnector(const std::string& name,
                            JingleChannelConnector* connector);
 
   // Called by JingleChannelConnector when it has finished connecting
   // the channel, to remove itself from the table of pending connectors.  The
   // connector assumes responsibility for destroying itself after this call.
   void OnChannelConnectorFinished(const std::string& name,
                                   JingleChannelConnector* connector);
 
-  // Creates channels after session has been accepted.
-  // TODO(sergeyu): Don't create channels in JingleSession.
-  void CreateChannels();
-
-  // Callbacks for the channels created in JingleSession.
-  // TODO(sergeyu): Remove this method once *_channel() methods are
-  // removed from Session interface.
-  void OnChannelConnected(scoped_ptr<net::Socket>* socket_container,
-                          net::StreamSocket* socket);
-
   const cricket::ContentInfo* GetContentInfo() const;
 
   void SetState(State new_state);
 
   // JingleSessionManager that created this session. Guaranteed to
   // exist throughout the lifetime of the session.
   JingleSessionManager* jingle_session_manager_;
 
   // Certificates used for connection. Currently only receiving side
   // has a certificate.
@@ skipping 29 matching lines @@
 
   std::string initiator_token_;
   std::string receiver_token_;
 
   // These data members are only set on the receiving side.
   scoped_ptr<const CandidateSessionConfig> candidate_config_;
 
   // Channels that are currently being connected.
   ChannelConnectorsMap channel_connectors_;
 
-  scoped_ptr<net::Socket> control_channel_socket_;
-  scoped_ptr<net::Socket> event_channel_socket_;
-
   ScopedRunnableMethodFactory<JingleSession> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_