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

Unified Diff: chrome/browser/media/encrypted_media_browsertest.cc

Issue 1016483002: Don't attempt playback if not possible (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: move check Created 5 years, 9 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/encrypted_media_browsertest.cc
diff --git a/chrome/browser/media/encrypted_media_browsertest.cc b/chrome/browser/media/encrypted_media_browsertest.cc
index 6606284597e61993f157243b970e9039036c56fe..f53a64519a3dd17493d1203cfcce54b4bbdc834c 100644
--- a/chrome/browser/media/encrypted_media_browsertest.cc
+++ b/chrome/browser/media/encrypted_media_browsertest.cc
@@ -416,6 +416,7 @@ class EncryptedMediaTest
void TestMultiplePlayback(const std::string& encrypted_media,
const std::string& media_type) {
+ DCHECK(IsPlayBackPossible(CurrentKeySystem()));
RunEncryptedMediaTest(kDefaultEmePlayer, encrypted_media, media_type,
CurrentKeySystem(), CurrentSourceType(),
CurrentEmeVersion(), kNoSessionToLoad, false,
@@ -575,6 +576,10 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_VideoClearAudio_WebM_Opus) {
}
IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, Playback_Multiple_VideoAudio_WebM) {
+ if (!IsPlayBackPossible(CurrentKeySystem())) {
+ DVLOG(0) << "Skipping test - Playback_Multiple test requires playback.";
+ return;
+ }
TestMultiplePlayback("bear-320x240-av_enc-av.webm", kWebMAudioVideo);
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698