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"
 
 namespace remoting {
 namespace protocol {
 
 // Determine how many update streams we should count to find the size of
 // average update stream.
 static const size_t kAverageUpdateStream = 10;
 
 ConnectionToClient::ConnectionToClient(MessageLoop* message_loop,
                                        EventHandler* handler)
     : loop_(message_loop),
       handler_(handler),
       host_stub_(NULL),
-      input_stub_(NULL) {
+      input_stub_(NULL),
+      control_connected_(false),
+      input_connected_(false),
+      video_connected_(false) {
   DCHECK(loop_);
   DCHECK(handler_);
 }
 
 ConnectionToClient::~ConnectionToClient() {
   // TODO(hclam): When we shut down the viewer we may have to close the
   // connection.
 }
 
 void ConnectionToClient::Init(protocol::Session* session) {
@@ skipping 43 matching lines @@
 void ConnectionToClient::set_input_stub(protocol::InputStub* input_stub) {
   input_stub_ = input_stub;
 }
 
 void ConnectionToClient::OnSessionStateChange(protocol::Session::State state) {
   DCHECK_EQ(loop_, MessageLoop::current());
 
   DCHECK(handler_);
   switch(state) {
     case protocol::Session::CONNECTING:
+      // Don't care about this message.
       break;
-    // Don't care about this message.
+
     case protocol::Session::CONNECTED:
+      video_writer_.reset(VideoWriter::Create(session_->config()));
+      video_writer_->Init(
+          session_.get(), base::Bind(&ConnectionToClient::OnVideoInitialized,
+                                     base::Unretained(this)));
+      break;
+
+    case protocol::Session::CONNECTED_CHANNELS:
       client_control_sender_.reset(
           new ClientControlSender(session_->control_channel()));
-      video_writer_.reset(VideoWriter::Create(session_->config()));
-      video_writer_->Init(session_.get());
-
       dispatcher_.reset(new HostMessageDispatcher());
       dispatcher_->Initialize(this, host_stub_, input_stub_);
 
-      handler_->OnConnectionOpened(this);
+      control_connected_ = true;
+      input_connected_ = true;
+      NotifyIfChannelsReady();
       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) {
+    LOG(ERROR) << "Failed to connect video channel";
+    CloseOnError();
+    return;
+  }
+
+  video_connected_ = true;
+  NotifyIfChannelsReady();
+}
+
+void ConnectionToClient::NotifyIfChannelsReady() {
+  if (control_connected_ && input_connected_ && video_connected_)
+    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