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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/bitstream_converter.h

Issue 7587012: Remove mock_ffmpeg and update media unittests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address CR comments. Created 9 years, 4 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
« media/base/run_all_unittests.cc ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/bitstream_converter_unittest.cc » ('j') | media/filters/bitstream_converter_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/bitstream_converter.h
diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
index a1ca3c615424cd58cd4f8eec5f7f697853941f04..4d66f89f7ed8254c39571ef4051539153579cf0f 100644
--- a/media/filters/bitstream_converter.h
+++ b/media/filters/bitstream_converter.h
@@ -69,11 +69,6 @@ class FFmpegBitstreamConverter : public BitstreamConverter {
virtual bool ConvertPacket(AVPacket* packet);
private:
- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_FailedFilter);
- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest, ConvertPacket_Success);
- FRIEND_TEST_ALL_PREFIXES(BitstreamConverterTest,
- ConvertPacket_SuccessInPlace);
-
std::string filter_name_;
AVBitStreamFilterContext* stream_filter_;
AVCodecContext* stream_context_;
« media/base/run_all_unittests.cc ('K') | « media/ffmpeg/ffmpeg_common.cc ('k') | media/filters/bitstream_converter_unittest.cc » ('j') | media/filters/bitstream_converter_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698