Remove video_channel() from Session interface

remoting/protocol/connection_to_client.cc

 // 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.
 
 #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"
 #include "remoting/protocol/host_message_dispatcher.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/input_stub.h"
 
 // TODO(hclam): Remove this header once MessageDispatcher is used.
 #include "remoting/base/compound_buffer.h"
 
@@ skipping 72 matching lines @@
 
   DCHECK(handler_);
   switch(state) {
     case protocol::Session::CONNECTING:
       break;
     // Don't care about this message.
     case protocol::Session::CONNECTED:
       client_control_sender_.reset(
           new ClientControlSender(session_->control_channel()));
       video_writer_.reset(VideoWriter::Create(session_->config()));
-      video_writer_->Init(session_.get());
-
+      video_writer_->Init(
+          session_.get(), base::Bind(&ConnectionToClient::OnVideoInitialized,
+                                     base::Unretained(this)));
       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:
-      CloseChannels();
-      handler_->OnConnectionFailed(this);
+      CloseOnError();
       break;
     default:
       // We shouldn't receive other states.
       NOTREACHED();
   }
 }
 
+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();
   if (client_control_sender_.get())
     client_control_sender_->Close();
 }
 
 }  // namespace protocol
 }  // namespace remoting