summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:18:46 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-16 23:18:46 +0000
commitf33811ba10a82b0211e5da3abbcd2bd64e3fe6fc (patch)
treea62acd3a45df426f5f2b1855808d6f43be5586c1 /media
parentdf17beda0e565c0f72954524d87b85f216e4358c (diff)
downloadchromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.zip
chromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.tar.gz
chromium_src-f33811ba10a82b0211e5da3abbcd2bd64e3fe6fc.tar.bz2
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
Diffstat (limited to 'media')
-rw-r--r--media/mf/mft_h264_decoder.h11
1 files changed, 6 insertions, 5 deletions
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<MftH264Decoder> {
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,