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

Unified Diff: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html

Issue 1021473002: Oilpan: adjust encrypted-media expectations following r192054. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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
« no previous file with comments | « no previous file | LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
diff --git a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
index 1fd8d2eee4b770e7a74e8e5b33030bc04d581fcb..0f1fdcc114ff3f5e0dca75ea4024c8a3b1f6edf7 100644
--- a/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
+++ b/LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeys-with-session.html
@@ -49,22 +49,23 @@
// Verify MediaKeys are not an ActiveDOMObject.
// In non-Oilpan, numActiveDOMObjectsCreate() == 0.
- // In Oilpan, numActiveDOMObjectsCreate() <= 2.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 3.
// (1 MediaKeysInitializer and
- // 1 MediaKeySystemAccessInitializer).
- assert_less_than_equal(numActiveDOMObjectsCreated(), 2, 'MediaKeys.create()');
+ // 1 MediaKeySystemAccessInitializer (navigator.requestMediaKeySystemAccess() use above),
+ // 1 MediaKeySystemAccessInitializer (isInitDataSupported() (via getSupportedInitDataType())))
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 3, 'MediaKeys.create()');
var mediaKeySession = mediaKeys.createSession();
return mediaKeySession.generateRequest(initDataType, initData);
}).then(function() {
// 1 MediaKeySession.
// In non-Oilpan, numActiveDOMObjectsCreate() == 1.
- // In Oilpan, numActiveDOMObjectsCreate() <= 4.
+ // In Oilpan, numActiveDOMObjectsCreate() <= 5.
// (1 MediaKeysInitializer,
- // 1 MediaKeySystemAccessInitializer,
+ // 2 MediaKeySystemAccessInitializers,
// 1 ContentDecryptionModuleResultPromise and
// 1 MediaKeySession).
- assert_less_than_equal(numActiveDOMObjectsCreated(), 4, 'MediaKeys.createSession(1)');
+ assert_less_than_equal(numActiveDOMObjectsCreated(), 5, 'MediaKeys.createSession(1)');
// Run gc(), should not affect MediaKeys object nor the
// session since we still have a reference to it.
« no previous file with comments | « no previous file | LayoutTests/media/encrypted-media/encrypted-media-lifetime-mediakeysession-reference.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698