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

media/cast/video_receiver/video_decoder_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 <cstdlib>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/synchronization/condition_variable.h"
 #include "base/synchronization/lock.h"
@@ skipping 43 matching lines @@
     CHECK_EQ(STATUS_VIDEO_INITIALIZED, video_decoder_->InitializationResult());
 
     next_frame_timestamp_ = base::TimeDelta();
     last_frame_id_ = 0;
     seen_a_decoded_frame_ = false;
 
     total_video_frames_feed_in_ = 0;
     total_video_frames_decoded_ = 0;
   }
 
-  // Called from the unit test thread to create another EncodedVideoFrame and
-  // push it into the decoding pipeline.
+  // Called from the unit test thread to create another EncodedFrame and push it
+  // into the decoding pipeline.
   void FeedMoreVideo(int num_dropped_frames) {
-    // Prepare a simulated EncodedVideoFrame to feed into the VideoDecoder.
+    // Prepare a simulated EncodedFrame to feed into the VideoDecoder.
 
     const gfx::Size frame_size(kWidth, kHeight);
     const scoped_refptr<VideoFrame> video_frame =
         VideoFrame::CreateFrame(VideoFrame::YV12,
                                 frame_size,
                                 gfx::Rect(frame_size),
                                 frame_size,
                                 next_frame_timestamp_);
     next_frame_timestamp_ += base::TimeDelta::FromSeconds(1) / kFrameRate;
     PopulateVideoFrame(video_frame, 0);
 
     // Encode |frame| into |encoded_frame->data|.
-    scoped_ptr<transport::EncodedVideoFrame> encoded_frame(
-        new transport::EncodedVideoFrame());
+    scoped_ptr<transport::EncodedFrame> encoded_frame(
+        new transport::EncodedFrame());
     CHECK_EQ(transport::kVp8, GetParam());  // Only support VP8 test currently.
     vp8_encoder_.Encode(video_frame, encoded_frame.get());
-    encoded_frame->codec = GetParam();
     encoded_frame->frame_id = last_frame_id_ + 1 + num_dropped_frames;
     last_frame_id_ = encoded_frame->frame_id;
 
     {
       base::AutoLock auto_lock(lock_);
       ++total_video_frames_feed_in_;
     }
 
     cast_environment_->PostTask(
         CastEnvironment::MAIN,
@@ skipping 83 matching lines @@
   }
   WaitForAllVideoToBeDecoded();
 }
 
 INSTANTIATE_TEST_CASE_P(VideoDecoderTestScenarios,
                         VideoDecoderTest,
                         ::testing::Values(transport::kVp8));
 
 }  // namespace cast
 }  // namespace media