Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1964)

Unified Diff: content/renderer/media/rtc_video_decoder_unittest.cc

Issue 7193001: Move rtc_video_decoder* from media/filter/ to content/renderer/media/. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 9 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;
@@ -170,5 +177,3 @@
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

Powered by Google App Engine
This is Rietveld 408576698