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

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

Issue 1043673002: Allow widevinecdmadapter to be built in Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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

Powered by Google App Engine
This is Rietveld 408576698