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 f53a64519a3dd17493d1203cfcce54b4bbdc834c..7bb8d6126b7a7cbf6f3ee7e8fd654aae808e400d 100644 |
--- a/chrome/browser/media/encrypted_media_browsertest.cc |
+++ b/chrome/browser/media/encrypted_media_browsertest.cc |
@@ -183,14 +183,16 @@ class EncryptedMediaTestBase : public MediaBrowserTest { |
RunEncryptedMediaTest(kDefaultEmePlayer, media_file, media_type, key_system, |
src_type, eme_version, kNoSessionToLoad, false, |
PlayTwice::NO, expected_title); |
- // Check KeyMessage received for all key systems. |
- bool receivedKeyMessage = false; |
- EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
- browser()->tab_strip_model()->GetActiveWebContents(), |
- "window.domAutomationController.send(" |
- "document.querySelector('video').receivedKeyMessage);", |
- &receivedKeyMessage)); |
- EXPECT_TRUE(receivedKeyMessage); |
+ if (expected_title == kEnded) { |
ddorwin
2015/03/28 04:00:11
You shouldn't need this. Just make your stub retur
jrummell
2015/04/01 23:37:36
Done. With the stub changes a message event is gen
|
+ // Check KeyMessage received for all key systems. |
+ bool receivedKeyMessage = false; |
+ EXPECT_TRUE(content::ExecuteScriptAndExtractBool( |
+ browser()->tab_strip_model()->GetActiveWebContents(), |
+ "window.domAutomationController.send(" |
+ "document.querySelector('video').receivedKeyMessage);", |
+ &receivedKeyMessage)); |
+ EXPECT_TRUE(receivedKeyMessage); |
+ } |
} |
// Starts a license server if available for the |key_system| and adds a |