Revert 96089 - Remove video_channel() from Session interface

remoting/protocol/jingle_session.cc

Index: remoting/protocol/jingle_session.cc
===================================================================
--- remoting/protocol/jingle_session.cc	(revision 96105)
+++ remoting/protocol/jingle_session.cc	(working copy)
@@ -33,6 +33,7 @@
 
 const char kControlChannelName[] = "control";
 const char kEventChannelName[] = "event";
+const char kVideoChannelName[] = "video";
 
 const int kMasterKeyLength = 16;
 const int kChannelKeyLength = 16;
@@ -159,6 +160,7 @@
 
     control_channel_socket_.reset();
     event_channel_socket_.reset();
+    video_channel_socket_.reset();
     STLDeleteContainerPairSecondPointers(channel_connectors_.begin(),
                                          channel_connectors_.end());
 
@@ -222,6 +224,23 @@
   return event_channel_socket_.get();
 }
 
+net::Socket* JingleSession::video_channel() {
+  DCHECK(CalledOnValidThread());
+  return video_channel_socket_.get();
+}
+
+net::Socket* JingleSession::video_rtp_channel() {
+  DCHECK(CalledOnValidThread());
+  NOTREACHED();
+  return NULL;
+}
+
+net::Socket* JingleSession::video_rtcp_channel() {
+  DCHECK(CalledOnValidThread());
+  NOTREACHED();
+  return NULL;
+}
+
 const std::string& JingleSession::jid() {
   // TODO(sergeyu): Fix ChromotingHost so that it doesn't call this
   // method on invalid thread and uncomment this DCHECK.
@@ -493,6 +512,7 @@
                  base::Unretained(this)));
   CreateStreamChannel(kControlChannelName, stream_callback);
   CreateStreamChannel(kEventChannelName, stream_callback);
+  CreateStreamChannel(kVideoChannelName, stream_callback);
 }
 
 void JingleSession::OnStreamChannelConnected(const std::string& name,
@@ -513,11 +533,14 @@
     control_channel_socket_.reset(socket);
   } else if (name == kEventChannelName) {
     event_channel_socket_.reset(socket);
+  } else if (name == kVideoChannelName) {
+    video_channel_socket_.reset(socket);
   } else {
     NOTREACHED();
   }
 
-  if (control_channel_socket_.get() && event_channel_socket_.get()) {
+  if (control_channel_socket_.get() && event_channel_socket_.get() &&
+      video_channel_socket_.get()) {
     // TODO(sergeyu): State should be set to CONNECTED in OnAccept
     // independent of the channels state.
     SetState(CONNECTED);