encrypted-media tests should not count # of SuspendableObjects

third_party/WebKit/Source/core/testing/Internals.cpp

Index: third_party/WebKit/Source/core/testing/Internals.cpp
diff --git a/third_party/WebKit/Source/core/testing/Internals.cpp b/third_party/WebKit/Source/core/testing/Internals.cpp
index 1e8ba46b6e1ecbcb9d1cb155c6b81fcfb5fa0fbe..c9c3ea6c7a5c397b1f2cdc76d3f891a6ceca5b74 100644
--- a/third_party/WebKit/Source/core/testing/Internals.cpp
+++ b/third_party/WebKit/Source/core/testing/Internals.cpp
@@ -1481,6 +1481,15 @@ void Internals::setUserPreferredLanguages(const Vector<String>& languages) {
   overrideUserPreferredLanguages(atomicLanguages);
 }
 
+unsigned Internals::mediaKeysCount() {
+  return InstanceCounters::counterValue(InstanceCounters::MediaKeysCounter);

[sof, 2016/12/26 08:00:47]

I'm unsure if it is acceptable for these to use global per-renderer process
counts, rather than per-document. (Delayed GCing of documents might lead to
flakiness for some test orderings..? )

[haraken, 2016/12/26 08:17:18]

That's why I inserted gc() in the beginning of these tests. Does it look okay?

[sof, 2016/12/26 09:23:06]

i think so, it's reasonable to require the caller to have called gc() first.

(I suspect the same change is possible for suspendableObjectCount(), and have it
be in terms of InstanceCounters instead.)

+}
+
+unsigned Internals::mediaKeySessionCount() {
+  return InstanceCounters::counterValue(
+      InstanceCounters::MediaKeySessionCounter);
+}
+
 unsigned Internals::suspendableObjectCount(Document* document) {
   DCHECK(document);
   return document->suspendableObjectCount();