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

Unified Diff: media/filters/ffmpeg_demuxer.h

Issue 3064007: GTTF: more FRIEND_TEST_ALL_PREFIXES (Closed)
Patch Set: Created 10 years, 5 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
« no previous file with comments | « media/filters/bitstream_converter.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 5f6d29f16351e771ed5c4701bd36cd466c8c2e3d..1d754bd5d582b2516f73f8c90b776dc49a9f11bb 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -26,6 +26,7 @@
#include <vector>
#include "base/callback.h"
+#include "base/gtest_prod_util.h"
#include "base/waitable_event.h"
#include "media/base/buffers.h"
#include "media/base/factory.h"
@@ -33,7 +34,6 @@
#include "media/base/media_format.h"
#include "media/filters/ffmpeg_glue.h"
#include "media/filters/ffmpeg_interfaces.h"
-#include "testing/gtest/include/gtest/gtest_prod.h"
// FFmpeg forward declarations.
struct AVFormatContext;
@@ -150,7 +150,7 @@ class FFmpegDemuxer : public Demuxer,
// Only allow a factory to create this class.
friend class FilterFactoryImpl0<FFmpegDemuxer>;
friend class MockFFmpegDemuxer;
- FRIEND_TEST(FFmpegDemuxerTest, ProtocolRead);
+ FRIEND_TEST_ALL_PREFIXES(FFmpegDemuxerTest, ProtocolRead);
FFmpegDemuxer();
virtual ~FFmpegDemuxer();
« no previous file with comments | « media/filters/bitstream_converter.h ('k') | media/filters/ffmpeg_video_decoder.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698