Remove video_channel() from Session interface

remoting/protocol/connection_to_client_unittest.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 "base/message_loop.h"
 #include "remoting/base/base_mock_objects.h"
+#include "remoting/base/constants.h"
 #include "remoting/protocol/fake_session.h"
 #include "remoting/protocol/connection_to_client.h"
 #include "remoting/protocol/protocol_mock_objects.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using ::testing::_;
 using ::testing::NotNull;
 using ::testing::StrictMock;
 
 namespace remoting {
@@ skipping 10 matching lines @@
     session_->set_message_loop(&message_loop_);
 
     // Allocate a ClientConnection object with the mock objects.
     viewer_ = new ConnectionToClient(&message_loop_, &handler_);
     viewer_->set_host_stub(&host_stub_);
     viewer_->set_input_stub(&input_stub_);
     viewer_->Init(session_);
     EXPECT_CALL(handler_, OnConnectionOpened(viewer_.get()));
     session_->state_change_callback()->Run(
         protocol::Session::CONNECTED);
+    session_->state_change_callback()->Run(
+        protocol::Session::CONNECTED_CHANNELS);
     message_loop_.RunAllPending();
   }
 
   MessageLoop message_loop_;
   MockConnectionToClientEventHandler handler_;
   MockHostStub host_stub_;
   MockInputStub input_stub_;
   scoped_refptr<ConnectionToClient> viewer_;
 
   // Owned by |viewer_|.
   protocol::FakeSession* session_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClientTest);
 };
 
 TEST_F(ConnectionToClientTest, SendUpdateStream) {
   // Then send the actual data.
   VideoPacket* packet = new VideoPacket();
   viewer_->video_stub()->ProcessVideoPacket(
       packet, new DeleteTask<VideoPacket>(packet));
 
   message_loop_.RunAllPending();
 
   // Verify that something has been written.
   // TODO(sergeyu): Verify that the correct data has been written.
-  EXPECT_GT(session_->video_channel()->written_data().size(), 0u);
+  ASSERT_TRUE(session_->GetStreamChannel(kVideoChannelName));
+  EXPECT_GT(session_->GetStreamChannel(kVideoChannelName)->
+            written_data().size(), 0u);
 
   // And then close the connection to ConnectionToClient.
   viewer_->Disconnect();
 
   message_loop_.RunAllPending();
 }
 
 TEST_F(ConnectionToClientTest, NoWriteAfterDisconnect) {
   // Then send the actual data.
   VideoPacket* packet = new VideoPacket();
@@ skipping 22 matching lines @@
 // Test that we can close client connection more than once.
 TEST_F(ConnectionToClientTest, Close) {
   viewer_->Disconnect();
   message_loop_.RunAllPending();
   viewer_->Disconnect();
   message_loop_.RunAllPending();
 }
 
 }  // namespace protocol
 }  // namespace remoting