[Cast] EncodedAudioFrame+EncodedVideoFrame+reference_time --> EncodedFrame

media/cast/video_receiver/video_receiver_unittest.cc

 // Copyright 2013 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/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/test/simple_test_tick_clock.h"
 #include "media/cast/cast_defines.h"
 #include "media/cast/cast_environment.h"
@@ skipping 19 matching lines @@
   FakeVideoClient() : num_called_(0) {}
   virtual ~FakeVideoClient() {}
 
   void SetNextExpectedResult(uint32 expected_frame_id,
                              const base::TimeTicks& expected_playout_time) {
     expected_frame_id_ = expected_frame_id;
     expected_playout_time_ = expected_playout_time;
   }
 
   void DeliverEncodedVideoFrame(
-      scoped_ptr<transport::EncodedVideoFrame> video_frame,
-      const base::TimeTicks& playout_time) {
+      scoped_ptr<transport::EncodedFrame> video_frame) {
     ASSERT_FALSE(!video_frame)
         << "If at shutdown: There were unsatisfied requests enqueued.";
     EXPECT_EQ(expected_frame_id_, video_frame->frame_id);
-    EXPECT_EQ(transport::kVp8, video_frame->codec);
-    EXPECT_EQ(expected_playout_time_, playout_time);
+    EXPECT_EQ(expected_playout_time_, video_frame->reference_time);
     ++num_called_;
   }
 
   int number_times_called() const { return num_called_; }
 
  private:
   int num_called_;
   uint32 expected_frame_id_;
   base::TimeTicks expected_playout_time_;
 
@@ skipping 92 matching lines @@
   EXPECT_EQ(rtp_header_.rtp_timestamp, frame_events.begin()->rtp_timestamp);
 
   cast_environment_->Logging()->RemoveRawEventSubscriber(&event_subscriber);
 }
 
 TEST_F(VideoReceiverTest, MultiplePendingGetCalls) {
   EXPECT_CALL(mock_transport_, SendRtcpPacket(_, _))
       .WillRepeatedly(testing::Return(true));
 
   // Enqueue a request for an video frame.
-  const VideoFrameEncodedCallback frame_encoded_callback =
+  const FrameEncodedCallback frame_encoded_callback =
       base::Bind(&FakeVideoClient::DeliverEncodedVideoFrame,
                  base::Unretained(&fake_video_client_));
   receiver_->GetEncodedVideoFrame(frame_encoded_callback);
   task_runner_->RunTasks();
   EXPECT_EQ(0, fake_video_client_.number_times_called());
 
   // Receive one video frame and expect to see the first request satisfied.
   fake_video_client_.SetNextExpectedResult(kFirstFrameId,
                                            testing_clock_->NowTicks());
   const base::TimeTicks time_at_first_frame_feed = testing_clock_->NowTicks();
@@ skipping 53 matching lines @@
   // Move forward another |rtp_max_delay_ms| and run any pending tasks (there
   // should be none).  Expect no additional frames where emitted.
   testing_clock_->Advance(
       base::TimeDelta::FromMilliseconds(config_.rtp_max_delay_ms));
   task_runner_->RunTasks();
   EXPECT_EQ(3, fake_video_client_.number_times_called());
 }
 
 }  // namespace cast
 }  // namespace media