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

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 <list>
 #include <map>
 #include <string>
@@ skipping 31 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 33 matching lines @@
   // Called from OnAccept() to initialize session config.
   bool InitializeConfigFromDescription(const ContentDescription* description);
 
   // Called by PepperChannel.
   void AddLocalCandidate(const cricket::Candidate& candidate);
   void OnDeleteChannel(PepperChannel* channel);
 
   void SendTransportInfo();
   void OnTransportInfoResponse(const buzz::XmlElement* response);
 
-  // Helper methods to create event and control channels.
-  // TODO(sergeyu): Remove these methods.
-  void CreateChannels();
-  void OnChannelConnected(scoped_ptr<net::Socket>* socket_container,
-                          net::StreamSocket* socket);
-
   // 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_;
   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_;
   scoped_ptr<IqRequest> transport_info_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_