Remove video_channel() from Session interface

remoting/protocol/rtp_video_writer_unittest.cc

 // Copyright (c) 2010 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 <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"
 #include "remoting/protocol/rtp_utils.h"
 #include "remoting/protocol/rtp_video_writer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using net::IOBuffer;
 using std::string;
 using std::vector;
@@ skipping 30 matching lines @@
 class RtpVideoWriterTest : public testing::Test {
  protected:
   struct ExpectedPacket {
     bool first;
     Vp8Descriptor::FragmentationInfo fragmentation_info;
     bool last;
   };
 
   virtual void SetUp() {
     session_.reset(new FakeSession());
-    writer_.Init(session_.get());
+    writer_.Init(session_.get(),
+                 base::Bind(&RtpVideoWriterTest::OnWriterInitialized,
+                            base::Unretained(this)));
+  }
+
+  void OnWriterInitialized(bool success) {
+    ASSERT_TRUE(success);
   }
 
   void InitData(int size) {
     data_.resize(size);
     for (int i = 0; i < size; ++i) {
       data_[i] = static_cast<char>(i);
     }
   }
 
   void InitPacket(int size, bool first, bool last) {
@@ skipping 10 matching lines @@
 
   bool CompareData(const CompoundBuffer& buffer, char* data, int size) {
     scoped_refptr<IOBuffer> buffer_data = buffer.ToIOBufferWithSize();
     return buffer.total_bytes() == size &&
         memcmp(buffer_data->data(), data, size) == 0;
   }
 
   void VerifyResult(const ExpectedPacket expected[],
                     int count) {
     const vector<string>& rtp_packets =
-        session_->video_rtp_channel()->written_packets();
+        session_->GetDatagramChannel(kVideoRtpChannelName)->written_packets();
     ASSERT_EQ(count, static_cast<int>(rtp_packets.size()));
     int pos = 0;
     for (int i = 0; i < count; ++i) {
       SCOPED_TRACE("Packet " + base::IntToString(i));
 
       RtpPacket packet;
       ASSERT_TRUE(ParsePacket(rtp_packets[i], &packet));
       EXPECT_EQ(expected[i].first, packet.vp8_descriptor().frame_beginning);
       EXPECT_EQ(expected[i].last, packet.header().marker);
       EXPECT_EQ(expected[i].fragmentation_info,
@@ skipping 68 matching lines @@
   ExpectedPacket expected[] = {
     { true, Vp8Descriptor::FIRST_FRAGMENT, false },
     { false, Vp8Descriptor::MIDDLE_FRAGMENT, false },
     { false, Vp8Descriptor::LAST_FRAGMENT, true },
   };
   VerifyResult(expected, arraysize(expected));
 }
 
 }  // namespace protocol
 }  // namespace remoting