Move rtc_video_decoder* from media/filter/ to content/renderer/media/.

content/renderer/media/rtc_video_decoder_unittest.cc

Index: content/renderer/media/rtc_video_decoder_unittest.cc
===================================================================
--- content/renderer/media/rtc_video_decoder_unittest.cc	(revision 89290)
+++ content/renderer/media/rtc_video_decoder_unittest.cc	(working copy)
@@ -7,6 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/singleton.h"
 #include "base/string_util.h"
+#include "content/renderer/media/rtc_video_decoder.h"
 #include "media/base/data_buffer.h"
 #include "media/base/filters.h"
 #include "media/base/limits.h"
@@ -15,7 +16,6 @@
 #include "media/base/mock_filters.h"
 #include "media/base/mock_task.h"
 #include "media/base/video_frame.h"
-#include "media/filters/rtc_video_decoder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
@@ -28,9 +28,16 @@
 using ::testing::StrictMock;
 using ::testing::WithArg;
 using ::testing::Invoke;
+using media::Limits;
+using media::MediaFormat;
+using media::MockStatisticsCallback;
+using media::MockVideoRenderer;
+using media::MockFilterHost;
+using media::NewExpectedCallback;
+using media::PipelineStatistics;
+using media::PIPELINE_OK;
+using media::StatisticsCallback;
 
-namespace media {
-
 class RTCVideoDecoderTest : public testing::Test {
  protected:
   static const int kWidth;
@@ -117,7 +124,7 @@
   EXPECT_EQ(RTCVideoDecoder::kNormal, decoder_->state_);
 }
 
-TEST_F(RTCVideoDecoderTest, DoDeliverFrame) {
+TEST_F(RTCVideoDecoderTest, DoRenderFrame) {
   const base::TimeDelta kZero;
   EXPECT_CALL(host_, GetTime()).WillRepeatedly(Return(base::TimeDelta()));
 
@@ -135,29 +142,26 @@
   EXPECT_CALL(*renderer_.get(), ConsumeVideoFrame(_))
       .Times(Limits::kMaxVideoFrames);
 
-  unsigned int video_frame_size = decoder_->width_*decoder_->height_*3/2;
-  unsigned char* video_frame = new unsigned char[video_frame_size];
-
+  cricket::NullVideoFrame video_frame;
   for (size_t i = 0; i < Limits::kMaxVideoFrames; ++i) {
-    decoder_->DeliverFrame(video_frame, video_frame_size);
+    decoder_->RenderFrame(&video_frame);
   }
-  delete [] video_frame;
 
   message_loop_.RunAllPending();
   EXPECT_EQ(RTCVideoDecoder::kNormal, decoder_->state_);
 }
 
-TEST_F(RTCVideoDecoderTest, DoFrameSizeChange) {
+TEST_F(RTCVideoDecoderTest, DoSetSize) {
   InitializeDecoderSuccessfully();
 
   int new_width = kWidth * 2;
   int new_height = kHeight * 2;
-  int new_number_of_streams = 0;
+  int reserved = 0;
 
   EXPECT_CALL(host_,
               SetVideoSize(new_width, new_height)).WillRepeatedly(Return());
 
-  decoder_->FrameSizeChange(new_width, new_height, new_number_of_streams);
+  decoder_->SetSize(new_width, new_height, reserved);
 
   const MediaFormat& media_format = decoder_->media_format();
   int width = 0;
@@ -169,6 +173,3 @@
 
   message_loop_.RunAllPending();
 }
-
-
-}  // namespace media