Revert 96089 - Remove video_channel() from Session interface

remoting/protocol/rtp_video_writer_unittest.cc

Index: remoting/protocol/rtp_video_writer_unittest.cc
===================================================================
--- remoting/protocol/rtp_video_writer_unittest.cc	(revision 96105)
+++ remoting/protocol/rtp_video_writer_unittest.cc	(working copy)
@@ -5,10 +5,8 @@
 #include <string>
 #include <vector>
 
-#include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
-#include "remoting/base/constants.h"
 #include "remoting/proto/video.pb.h"
 #include "remoting/protocol/fake_session.h"
 #include "remoting/protocol/rtp_reader.h"
@@ -59,15 +57,9 @@
 
   virtual void SetUp() {
     session_.reset(new FakeSession());
-    writer_.Init(session_.get(),
-                 base::Bind(&RtpVideoWriterTest::OnWriterInitialized,
-                            base::Unretained(this)));
+    writer_.Init(session_.get());
   }
 
-  void OnWriterInitialized(bool success) {
-    ASSERT_TRUE(success);
-  }
-
   void InitData(int size) {
     data_.resize(size);
     for (int i = 0; i < size; ++i) {
@@ -96,7 +88,7 @@
   void VerifyResult(const ExpectedPacket expected[],
                     int count) {
     const vector<string>& rtp_packets =
-        session_->GetDatagramChannel(kVideoRtpChannelName)->written_packets();
+        session_->video_rtp_channel()->written_packets();
     ASSERT_EQ(count, static_cast<int>(rtp_packets.size()));
     int pos = 0;
     for (int i = 0; i < count; ++i) {