From f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Mon, 16 Aug 2010 23:18:46 +0000 Subject: GTTF: some more FRIEND_TEST_ALL_PREFIXES TEST=none BUG=44549 Review URL: http://codereview.chromium.org/3161021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56253 0039d316-1c4b-4281-b951-d872f2087c98 --- media/mf/mft_h264_decoder.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'media/mf') diff --git a/media/mf/mft_h264_decoder.h b/media/mf/mft_h264_decoder.h index 750875a..355cb4c 100644 --- a/media/mf/mft_h264_decoder.h +++ b/media/mf/mft_h264_decoder.h @@ -17,8 +17,8 @@ #include "base/basictypes.h" #include "base/callback.h" +#include "base/gtest_prod_util.h" #include "base/scoped_ptr.h" -#include "testing/gtest/include/gtest/gtest_prod.h" struct IDirect3DDeviceManager9; struct IMFTransform; @@ -80,10 +80,11 @@ class MftH264Decoder : public base::RefCountedThreadSafe { private: friend class MftH264DecoderTest; - FRIEND_TEST(MftH264DecoderTest, SendDrainMessageBeforeInitDeathTest); - FRIEND_TEST(MftH264DecoderTest, SendDrainMessageAtInit); - FRIEND_TEST(MftH264DecoderTest, DrainOnEndOfInputStream); - FRIEND_TEST(MftH264DecoderTest, NoOutputOnGarbageInput); + FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, + SendDrainMessageBeforeInitDeathTest); + FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, SendDrainMessageAtInit); + FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, DrainOnEndOfInputStream); + FRIEND_TEST_ALL_PREFIXES(MftH264DecoderTest, NoOutputOnGarbageInput); bool InitComMfLibraries(); bool InitDecoder(IDirect3DDeviceManager9* dev_manager, -- cgit v1.1