Fix and enable mojo:media_pipeline_integration_apptests.

media/test/pipeline_integration_test.cc

Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 43da5c1d69ea4d6f97f6e728ca385208fa451605..58c3813517ee69f66dc5b39b164257093346a313 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -53,11 +53,15 @@
 // TODO(xhwang,dalecurtis): Text tracks are not currently supported by the mojo
 // renderer.
 #define DISABLE_TEXT_TRACK_TESTS 1
+
+// TODO(jrummell, dalecurtis): Clockless playback does not currently work with
+// mojo, so the tests take too long to run.
+#define DISABLE_CLOCKLESS_TESTS 1
 #else
 #define EXPECT_HASH_EQ(a, b) EXPECT_EQ(a, b)
 #define EXPECT_VIDEO_FORMAT_EQ(a, b) EXPECT_EQ(a, b)
 #define EXPECT_COLOR_SPACE_EQ(a, b) EXPECT_EQ(a, b)
-#endif
+#endif  // defined(MOJO_RENDERER)
 
 using testing::_;
 using testing::AnyNumber;
@@ -78,10 +82,8 @@ const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
 const char kADTS[] = "audio/aac";
 const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
 const char kMP4VideoAVC3[] = "video/mp4; codecs=\"avc3.64001f\"";
-#if !defined(DISABLE_EME_TESTS)
 const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\"";
 const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\"";
-#endif  // !defined(DISABLE_EME_TESTS)
 const char kMP3[] = "audio/mpeg";
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
@@ -103,9 +105,7 @@ const size_t kAppendWholeFile = std::numeric_limits<size_t>::max();
 const int kAppendTimeSec = 1;
 const int kAppendTimeMs = kAppendTimeSec * 1000;
 const int k320WebMFileDurationMs = 2736;
-#if !defined(DISABLE_EME_TESTS)
 const int k320EncWebMFileDurationMs = 2737;
-#endif  // !defined(DISABLE_EME_TESTS)
 const int k640WebMFileDurationMs = 2749;
 const int kOpusEndTrimmingWebMFileDurationMs = 2741;
 const int kVP9WebMFileDurationMs = 2736;
@@ -130,13 +130,11 @@ static const char kOpusEndTrimmingHash_2[] =
 static const char kOpusEndTrimmingHash_3[] =
     "-13.28,-14.35,-13.67,-11.68,-10.18,-10.46,";
 #endif  // defined(OPUS_FIXED_POINT)
-#endif
+#endif  // !defined(MOJO_RENDERER)
 
 #if defined(USE_PROPRIETARY_CODECS)
-#if !defined(DISABLE_EME_TESTS)
 const int k640IsoFileDurationMs = 2737;
 const int k640IsoCencFileDurationMs = 2736;
-#endif  // !defined(DISABLE_EME_TESTS)
 const int k1280IsoFileDurationMs = 2736;
 const int k1280IsoAVC3FileDurationMs = 2736;
 #endif  // defined(USE_PROPRIETARY_CODECS)
@@ -677,7 +675,7 @@ class PipelineIntegrationTestHost : public mojo::test::ApplicationTestBase,
 #else
 class PipelineIntegrationTestHost : public testing::Test,
                                     public PipelineIntegrationTestBase {};
-#endif
+#endif  // defined(MOJO_RENDERER)
 
 class PipelineIntegrationTest : public PipelineIntegrationTestHost {
  public:
@@ -830,7 +828,14 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed) {
   EXPECT_TRUE(demuxer_->GetTimelineOffset().is_null());
 }
 
-TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOggTrimmingHashed) {
+#if defined(DISABLE_CLOCKLESS_TESTS)
+#define MAYBE_BasicPlaybackOpusOggTrimmingHashed \
+  DISABLED_BasicPlaybackOpusOggTrimmingHashed
+#else
+#define MAYBE_BasicPlaybackOpusOggTrimmingHashed \
+  BasicPlaybackOpusOggTrimmingHashed
+#endif  // defined(DISABLE_CLOCKLESS_TESTS)

[xhwang, 2016/01/20 05:33:35]

Is it possible to wrap these defines in a macro, something like:

https://code.google.com/p/chromium/codesearch#chromium/src/ui/aura/window_eve...

[jrummell, 2016/01/21 01:30:25]

Done.

+TEST_F(PipelineIntegrationTest, MAYBE_BasicPlaybackOpusOggTrimmingHashed) {
   ASSERT_EQ(PIPELINE_OK,
             Start("opus-trimming-test.webm", kHashed | kClockless));
 
@@ -853,7 +858,14 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackOpusOggTrimmingHashed) {
   EXPECT_HASH_EQ(kOpusEndTrimmingHash_3, GetAudioHash());
 }
 
-TEST_F(PipelineIntegrationTest, BasicPlaybackOpusWebmTrimmingHashed) {
+#if defined(DISABLE_CLOCKLESS_TESTS)
+#define MAYBE_BasicPlaybackOpusWebmTrimmingHashed \
+  DISABLED_BasicPlaybackOpusWebmTrimmingHashed
+#else
+#define MAYBE_BasicPlaybackOpusWebmTrimmingHashed \
+  BasicPlaybackOpusWebmTrimmingHashed
+#endif  // defined(DISABLE_CLOCKLESS_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_BasicPlaybackOpusWebmTrimmingHashed) {
   ASSERT_EQ(PIPELINE_OK,
             Start("opus-trimming-test.webm", kHashed | kClockless));
 
@@ -876,8 +888,15 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackOpusWebmTrimmingHashed) {
   EXPECT_HASH_EQ(kOpusEndTrimmingHash_3, GetAudioHash());
 }
 
+#if defined(DISABLE_CLOCKLESS_TESTS)
+#define MAYBE_BasicPlaybackOpusWebmTrimmingHashed_MediaSource \
+  DISABLED_BasicPlaybackOpusWebmTrimmingHashed_MediaSource
+#else
+#define MAYBE_BasicPlaybackOpusWebmTrimmingHashed_MediaSource \
+  BasicPlaybackOpusWebmTrimmingHashed_MediaSource
+#endif  // defined(DISABLE_CLOCKLESS_TESTS)
 TEST_F(PipelineIntegrationTest,
-       BasicPlaybackOpusWebmTrimmingHashed_MediaSource) {
+       MAYBE_BasicPlaybackOpusWebmTrimmingHashed_MediaSource) {
   MockMediaSource source("opus-trimming-test.webm", kOpusAudioOnlyWebM,
                          kAppendWholeFile);
   StartHashedClocklessPipelineWithMediaSource(&source);
@@ -942,8 +961,12 @@ TEST_F(PipelineIntegrationTest, F32PlaybackHashed) {
   EXPECT_HASH_EQ("3.03,2.86,2.99,3.31,3.57,4.06,", GetAudioHash());
 }
 
-#if !defined(DISABLE_EME_TESTS)
-TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_BasicPlaybackEncrypted DISABLED_BasicPlaybackEncrypted
+#else
+#define MAYBE_BasicPlaybackEncrypted BasicPlaybackEncrypted
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_BasicPlaybackEncrypted) {
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
   set_encrypted_media_init_data_cb(
       base::Bind(&FakeEncryptedMedia::OnEncryptedMediaInitData,
@@ -957,7 +980,6 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackEncrypted) {
   ASSERT_TRUE(WaitUntilOnEnded());
   Stop();
 }
-#endif  // !defined(DISABLE_EME_TESTS)
 
 TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource) {
   MockMediaSource source("bear-320x240.webm", kWebM, 219229);
@@ -1156,8 +1178,14 @@ TEST_F(PipelineIntegrationTest, MediaSource_FillUp_Buffer) {
   Stop();
 }
 
-#if !defined(DISABLE_EME_TESTS)
-TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_Encrypted_WebM \
+  DISABLED_MediaSource_ConfigChange_Encrypted_WebM
+#else
+#define MAYBE_MediaSource_ConfigChange_Encrypted_WebM \
+  MediaSource_ConfigChange_Encrypted_WebM
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_MediaSource_ConfigChange_Encrypted_WebM) {
   MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1184,8 +1212,15 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_Encrypted_WebM) {
 }
 
 // Config changes from encrypted to clear are not currently supported.
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_ClearThenEncrypted_WebM \
+  DISABLED_MediaSource_ConfigChange_ClearThenEncrypted_WebM
+#else
+#define MAYBE_MediaSource_ConfigChange_ClearThenEncrypted_WebM \
+  MediaSource_ConfigChange_ClearThenEncrypted_WebM
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       MediaSource_ConfigChange_ClearThenEncrypted_WebM) {
+       MAYBE_MediaSource_ConfigChange_ClearThenEncrypted_WebM) {
   MockMediaSource source("bear-320x240-16x9-aspect.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1215,8 +1250,15 @@ TEST_F(PipelineIntegrationTest,
 }
 
 // Config changes from clear to encrypted are not currently supported.
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_EncryptedThenClear_WebM \
+  DISABLED_MediaSource_ConfigChange_EncryptedThenClear_WebM
+#else
+#define MAYBE_MediaSource_ConfigChange_EncryptedThenClear_WebM \
+  MediaSource_ConfigChange_EncryptedThenClear_WebM
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       MediaSource_ConfigChange_EncryptedThenClear_WebM) {
+       MAYBE_MediaSource_ConfigChange_EncryptedThenClear_WebM) {
   MockMediaSource source("bear-320x240-16x9-aspect-av_enc-av.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1241,7 +1283,6 @@ TEST_F(PipelineIntegrationTest,
   EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
   source.Shutdown();
 }
-#endif  // !defined(DISABLE_EME_TESTS)
 
 #if defined(USE_PROPRIETARY_CODECS)
 TEST_F(PipelineIntegrationTest, MediaSource_ADTS) {
@@ -1302,6 +1343,7 @@ TEST_F(PipelineIntegrationTest, BasicPlaybackHashed_MP3) {
   EXPECT_HASH_EQ("1.30,2.72,4.56,5.08,3.74,2.03,", GetAudioHash());
 }
 
+#if !defined(DISABLE_CLOCKLESS_TESTS)
 class Mp3FastSeekParams {
  public:
   Mp3FastSeekParams(const char* filename, const char* hash)
@@ -1360,6 +1402,7 @@ INSTANTIATE_TEST_CASE_P(
                                         "-0.15,-0.83,0.54,1.00,1.94,0.93,"),
                       Mp3FastSeekParams("bear-audio-10s-VBR-no-TOC.mp3",
                                         "-0.22,0.80,1.19,0.73,-0.31,-1.12,")));
+#endif  // !defined(DISABLE_CLOCKLESS_TESTS)
 
 TEST_F(PipelineIntegrationTest, MediaSource_MP3) {
   MockMediaSource source("sfx.mp3", kMP3, kAppendWholeFile);
@@ -1442,9 +1485,15 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
   Stop();
 }
 
-#if !defined(DISABLE_EME_TESTS)
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly \
+  DISABLED_MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly
+#else
+#define MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly \
+  MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly) {
+       MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_VideoOnly) {
   MockMediaSource source("bear-640x360-v_frag-cenc.mp4", kMP4Video,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1470,8 +1519,16 @@ TEST_F(PipelineIntegrationTest,
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest,
-       MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly \
+  DISABLED_MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly
+#else
+#define MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly \
+  MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(
+    PipelineIntegrationTest,
+    MAYBE_MediaSource_ConfigChange_Encrypted_MP4_CENC_KeyRotation_VideoOnly) {
   MockMediaSource source("bear-640x360-v_frag-cenc-key_rotation.mp4", kMP4Video,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new RotatingKeyProvidingApp());
@@ -1530,8 +1587,15 @@ TEST_F(PipelineIntegrationTest,
 }
 
 // Config changes from encrypted to clear are not currently supported.
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC \
+  DISABLED_MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC
+#else
+#define MAYBE_MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC \
+  MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC) {
+       MAYBE_MediaSource_ConfigChange_EncryptedThenClear_MP4_CENC) {
   MockMediaSource source("bear-640x360-v_frag-cenc.mp4", kMP4Video,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1556,7 +1620,6 @@ TEST_F(PipelineIntegrationTest,
   EXPECT_EQ(PIPELINE_ERROR_DECODE, WaitUntilEndedOrError());
   source.Shutdown();
 }
-#endif  // !defined(DISABLE_EME_TESTS)
 
 // Verify files which change configuration midstream fail gracefully.
 TEST_F(PipelineIntegrationTest, MidStreamConfigChangesFail) {
@@ -1564,8 +1627,7 @@ TEST_F(PipelineIntegrationTest, MidStreamConfigChangesFail) {
   Play();
   ASSERT_EQ(WaitUntilEndedOrError(), PIPELINE_ERROR_DECODE);
 }
-
-#endif
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
   ASSERT_EQ(PIPELINE_OK, Start("bear-320x240-16x9-aspect.webm"));
@@ -1573,8 +1635,12 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_16x9AspectRatio) {
   ASSERT_TRUE(WaitUntilOnEnded());
 }
 
-#if !defined(DISABLE_EME_TESTS)
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_WebM) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_WebM DISABLED_EncryptedPlayback_WebM
+#else
+#define MAYBE_EncryptedPlayback_WebM EncryptedPlayback_WebM
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_EncryptedPlayback_WebM) {
   MockMediaSource source("bear-320x240-av_enc-av.webm", kWebM, 219816);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
   StartPipelineWithEncryptedMedia(&source, &encrypted_media);
@@ -1589,7 +1655,14 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_WebM) {
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_ClearStart_WebM) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_ClearStart_WebM \
+  DISABLED_EncryptedPlayback_ClearStart_WebM
+#else
+#define MAYBE_EncryptedPlayback_ClearStart_WebM \
+  EncryptedPlayback_ClearStart_WebM
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_EncryptedPlayback_ClearStart_WebM) {
   MockMediaSource source("bear-320x240-av_enc-av_clear-1s.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1605,7 +1678,15 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_ClearStart_WebM) {
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_NoEncryptedFrames_WebM) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_WebM \
+  DISABLED_EncryptedPlayback_NoEncryptedFrames_WebM
+#else
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_WebM \
+  EncryptedPlayback_NoEncryptedFrames_WebM
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest,
+       MAYBE_EncryptedPlayback_NoEncryptedFrames_WebM) {
   MockMediaSource source("bear-320x240-av_enc-av_clear-all.webm", kWebM,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new NoResponseApp());
@@ -1620,11 +1701,16 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_NoEncryptedFrames_WebM) {
   source.Shutdown();
   Stop();
 }
-#endif  // !defined(DISABLE_EME_TESTS)
 
 #if defined(USE_PROPRIETARY_CODECS)
-#if !defined(DISABLE_EME_TESTS)
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_VideoOnly) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_MP4_CENC_VideoOnly \
+  DISABLED_EncryptedPlayback_MP4_CENC_VideoOnly
+#else
+#define MAYBE_EncryptedPlayback_MP4_CENC_VideoOnly \
+  EncryptedPlayback_MP4_CENC_VideoOnly
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_EncryptedPlayback_MP4_CENC_VideoOnly) {
   MockMediaSource source("bear-1280x720-v_frag-cenc.mp4", kMP4Video,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1640,7 +1726,14 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_VideoOnly) {
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_AudioOnly) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_MP4_CENC_AudioOnly \
+  DISABLED_EncryptedPlayback_MP4_CENC_AudioOnly
+#else
+#define MAYBE_EncryptedPlayback_MP4_CENC_AudioOnly \
+  EncryptedPlayback_MP4_CENC_AudioOnly
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest, MAYBE_EncryptedPlayback_MP4_CENC_AudioOnly) {
   MockMediaSource source("bear-1280x720-a_frag-cenc.mp4", kMP4Audio,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new KeyProvidingApp());
@@ -1656,8 +1749,15 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_AudioOnly) {
   Stop();
 }
 
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly \
+  DISABLED_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly
+#else
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly \
+  EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly) {
+       MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_VideoOnly) {
   MockMediaSource source("bear-1280x720-v_frag-cenc_clear-all.mp4", kMP4Video,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new NoResponseApp());
@@ -1673,8 +1773,15 @@ TEST_F(PipelineIntegrationTest,
   Stop();
 }
 
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly \
+  DISABLED_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly
+#else
+#define MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly \
+  EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly
+#endif  // defined(DISABLE_EME_TESTS)
 TEST_F(PipelineIntegrationTest,
-       EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly) {
+       MAYBE_EncryptedPlayback_NoEncryptedFrames_MP4_CENC_AudioOnly) {
   MockMediaSource source("bear-1280x720-a_frag-cenc_clear-all.mp4", kMP4Audio,
                          kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new NoResponseApp());
@@ -1690,7 +1797,15 @@ TEST_F(PipelineIntegrationTest,
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_KeyRotation_Video) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Video \
+  DISABLED_EncryptedPlayback_MP4_CENC_KeyRotation_Video
+#else
+#define MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Video \
+  EncryptedPlayback_MP4_CENC_KeyRotation_Video
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest,
+       MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Video) {
   MockMediaSource source("bear-1280x720-v_frag-cenc-key_rotation.mp4",
                          kMP4Video, kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new RotatingKeyProvidingApp());
@@ -1706,7 +1821,15 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_KeyRotation_Video) {
   Stop();
 }
 
-TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_KeyRotation_Audio) {
+#if defined(DISABLE_EME_TESTS)
+#define MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Audio \
+  DISABLED_EncryptedPlayback_MP4_CENC_KeyRotation_Audio
+#else
+#define MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Audio \
+  EncryptedPlayback_MP4_CENC_KeyRotation_Audio
+#endif  // defined(DISABLE_EME_TESTS)
+TEST_F(PipelineIntegrationTest,
+       MAYBE_EncryptedPlayback_MP4_CENC_KeyRotation_Audio) {
   MockMediaSource source("bear-1280x720-a_frag-cenc-key_rotation.mp4",
                          kMP4Audio, kAppendWholeFile);
   FakeEncryptedMedia encrypted_media(new RotatingKeyProvidingApp());
@@ -1721,7 +1844,6 @@ TEST_F(PipelineIntegrationTest, EncryptedPlayback_MP4_CENC_KeyRotation_Audio) {
   source.Shutdown();
   Stop();
 }
-#endif  // !defined(DISABLE_EME_TESTS)
 
 TEST_F(PipelineIntegrationTest, BasicPlayback_MediaSource_VideoOnly_MP4_AVC3) {
   MockMediaSource source("bear-1280x720-v_frag-avc3.mp4", kMP4VideoAVC3,
@@ -1836,7 +1958,7 @@ TEST_F(PipelineIntegrationTest, Rotated_Metadata_270) {
   ASSERT_EQ(PIPELINE_OK, Start("bear_rotate_270.mp4"));
   ASSERT_EQ(VIDEO_ROTATION_270, metadata_.video_rotation);
 }
-#endif
+#endif  // defined(USE_PROPRIETARY_CODECS)
 
 // Verify audio decoder & renderer can handle aborted demuxer reads.
 TEST_F(PipelineIntegrationTest, ChunkDemuxerAbortRead_AudioOnly) {