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

content/renderer/media/rtc_video_decoder_unittest.cc

 // Copyright (c) 2011 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 <deque>
 
 #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"
 #include "media/base/mock_callback.h"
 #include "media/base/mock_filter_host.h"
 #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::_;
 using ::testing::AnyNumber;
 using ::testing::DoAll;
 using ::testing::Message;
 using ::testing::Return;
 using ::testing::ReturnNull;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
 using ::testing::WithArg;
 using ::testing::Invoke;
-
-namespace media {
+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;
 
 class RTCVideoDecoderTest : public testing::Test {
  protected:
   static const int kWidth;
   static const int kHeight;
   static const char* kUrl;
   static const PipelineStatistics kStatistics;
 
   RTCVideoDecoderTest() {
     MediaFormat media_format;
@@ skipping 85 matching lines @@
       base::Bind(&RTCVideoDecoder::ProduceVideoFrame,
                  base::Unretained(decoder_.get())));
   decoder_->Seek(kZero, NewExpectedStatusCB(PIPELINE_OK));
 
   decoder_->set_consume_video_frame_callback(
       base::Bind(&MockVideoRenderer::ConsumeVideoFrame,
                  base::Unretained(renderer_.get())));
   EXPECT_CALL(*renderer_.get(), ConsumeVideoFrame(_))
       .Times(Limits::kMaxVideoFrames);
 
   unsigned int video_frame_size = decoder_->width_*decoder_->height_*3/2;

[scherkus (not reviewing), 2011/06/29 00:39:28]

spaces around binary operators (*, /, etc)

[Ronghua, 2011/06/29 20:36:39]

Done.

   unsigned char* video_frame = new unsigned char[video_frame_size];

[scherkus (not reviewing), 2011/06/29 00:39:28]

uint8

[Ronghua, 2011/06/29 20:36:39]

Done.

 
   for (size_t i = 0; i < Limits::kMaxVideoFrames; ++i) {
     decoder_->DeliverFrame(video_frame, video_frame_size);
   }
   delete [] video_frame;
 
   message_loop_.RunAllPending();
   EXPECT_EQ(RTCVideoDecoder::kNormal, decoder_->state_);
 }
 
@@ skipping 12 matching lines @@
   const MediaFormat& media_format = decoder_->media_format();
   int width = 0;
   int height = 0;
   EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kWidth, &width));
   EXPECT_EQ(new_width, width);
   EXPECT_TRUE(media_format.GetAsInteger(MediaFormat::kHeight, &height));
   EXPECT_EQ(new_height, height);
 
   message_loop_.RunAllPending();
 }
 

[scherkus (not reviewing), 2011/06/29 00:39:28]

nit: blank line

[Ronghua, 2011/06/29 20:36:39]

Done.

-
-}  // namespace media