Remove video_channel() from Session interface

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 10 matching lines @@
 
 namespace remoting {
 namespace protocol {
 
 // Generic interface for Chromotocol connection used by both client and host.
 // Provides access to the connection channels, but doesn't depend on the
 // protocol used for each channel.
 class Session : public base::NonThreadSafe {
  public:
   enum State {
+    // Created, but not connecting yet.
     INITIALIZING,
+
+    // Sent or received session-initiate, but haven't sent or received
+    // session-accept.
     CONNECTING,
+
+    // Session has been accepted, but channels are connected yet.
     CONNECTED,
+
+    // Video and control channels are connected.
+    // TODO(sergeyu): Remove this state.
+    CONNECTED_CHANNELS,
+
+    // Session has been closed.
     CLOSED,
+
+    // Connection has failed.
     FAILED,
   };
 
   typedef Callback1<State>::Type StateChangeCallback;
   typedef base::Callback<void(const std::string&, net::StreamSocket*)>
       StreamChannelCallback;
   typedef base::Callback<void(const std::string&, net::Socket*)>
       DatagramChannelCallback;
 
   Session() { }
@@ skipping 12 matching lines @@
   // CONNECTED state.
   virtual void CreateStreamChannel(
       const std::string& name, const StreamChannelCallback& callback) = 0;
   virtual void CreateDatagramChannel(
       const std::string& name, const DatagramChannelCallback& callback) = 0;
 
   // TODO(sergeyu): Remove these methods, and use CreateChannel()
   // instead.
   virtual net::Socket* control_channel() = 0;
   virtual net::Socket* event_channel() = 0;
-  virtual net::Socket* video_channel() = 0;
-  virtual net::Socket* video_rtp_channel() = 0;
-  virtual net::Socket* video_rtcp_channel() = 0;
 
   // JID of the other side.
   virtual const std::string& jid() = 0;
 
   // Configuration of the protocol that was sent or received in the
   // session-initiate jingle message. Returned pointer is valid until
   // connection is closed.
   virtual const CandidateSessionConfig* candidate_config() = 0;
 
   // Protocol configuration. Can be called only after session has been accepted.
@@ skipping 22 matching lines @@
   virtual void Close() = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_SESSION_H_