Revert 96089 - Remove video_channel() from Session interface

remoting/protocol/connection_to_client.cc

Index: remoting/protocol/connection_to_client.cc
===================================================================
--- remoting/protocol/connection_to_client.cc	(revision 96105)
+++ remoting/protocol/connection_to_client.cc	(working copy)
@@ -4,7 +4,6 @@
 
 #include "remoting/protocol/connection_to_client.h"
 
-#include "base/bind.h"
 #include "google/protobuf/message.h"
 #include "net/base/io_buffer.h"
 #include "remoting/protocol/client_control_sender.h"
@@ -97,18 +96,20 @@
       client_control_sender_.reset(
           new ClientControlSender(session_->control_channel()));
       video_writer_.reset(VideoWriter::Create(session_->config()));
-      video_writer_->Init(
-          session_.get(), base::Bind(&ConnectionToClient::OnVideoInitialized,
-                                     base::Unretained(this)));
+      video_writer_->Init(session_.get());
+
       dispatcher_.reset(new HostMessageDispatcher());
       dispatcher_->Initialize(this, host_stub_, input_stub_);
+
+      handler_->OnConnectionOpened(this);
       break;
     case protocol::Session::CLOSED:
       CloseChannels();
       handler_->OnConnectionClosed(this);
       break;
     case protocol::Session::FAILED:
-      CloseOnError();
+      CloseChannels();
+      handler_->OnConnectionFailed(this);
       break;
     default:
       // We shouldn't receive other states.
@@ -116,20 +117,6 @@
   }
 }
 
-void ConnectionToClient::OnVideoInitialized(bool successful) {
-  if (!successful) {
-    CloseOnError();
-    return;
-  }
-
-  handler_->OnConnectionOpened(this);
-}
-
-void ConnectionToClient::CloseOnError() {
-  CloseChannels();
-  handler_->OnConnectionFailed(this);
-}
-
 void ConnectionToClient::CloseChannels() {
   if (video_writer_.get())
     video_writer_->Close();