| Index: media/filters/bitstream_converter.h
|
| diff --git a/media/filters/bitstream_converter.h b/media/filters/bitstream_converter.h
|
| index d52a4b225ac63b3c2075c7e0157648da29d27dfd..7417209f291d2e7af2b872cd92d60172e2f0370c 100644
|
| --- a/media/filters/bitstream_converter.h
|
| +++ b/media/filters/bitstream_converter.h
|
| @@ -13,10 +13,9 @@
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/gtest_prod_util.h"
|
| #include "base/logging.h"
|
|
|
| -#include "testing/gtest/include/gtest/gtest_prod.h"
|
| -
|
| // FFmpeg types.
|
| struct AVBitStreamFilterContext;
|
| struct AVCodecContext;
|
| @@ -66,9 +65,10 @@ class FFmpegBitstreamConverter : public BitstreamConverter {
|
| virtual bool ConvertPacket(AVPacket* packet);
|
|
|
| private:
|
| - FRIEND_TEST(BitstreamConverterTest, ConvertPacket_FailedFilter);
|
| - FRIEND_TEST(BitstreamConverterTest, ConvertPacket_Success);
|
| - FRIEND_TEST(BitstreamConverterTest, ConvertPacket_SuccessInPlace);
|
| + 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_;
|
|
|