Chromium Code Reviews| 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..bac95ce63f98e68e6ca8e58dcf6fc3124c518764 100644 |
| --- a/chrome/browser/media/encrypted_media_browsertest.cc |
| +++ b/chrome/browser/media/encrypted_media_browsertest.cc |
| @@ -416,6 +416,12 @@ class EncryptedMediaTest |
| void TestMultiplePlayback(const std::string& encrypted_media, |
| const std::string& media_type) { |
| + // TestSimplePlayback() checks for KEY_ERROR if playback is not possible. |
|
ddorwin
2015/03/16 19:17:47
Instead, I would follow the pattern at line 596.
jrummell
2015/03/16 20:13:06
Done.
|
| + // Since this just runs playback twice, don't waste time if playback not |
| + // possible. |
| + if (!IsPlayBackPossible(CurrentKeySystem())) |
| + return; |
| + |
| RunEncryptedMediaTest(kDefaultEmePlayer, encrypted_media, media_type, |
| CurrentKeySystem(), CurrentSourceType(), |
| CurrentEmeVersion(), kNoSessionToLoad, false, |