VideoCapturerAndroidTest: Dispose PeerConnectionFactory with pending frames
Partial revert of change in testReturnBufferLateEndToEnd from https://codereview.webrtc.org/1350863002/. It is ok to dispose PeerConnectionFactory with pending frames after all.
BUG=webrtc:4909
R=perkj@webrtc.org
Review URL: https://codereview.webrtc.org/1363303002 .
Cr-Commit-Position: refs/heads/master@{#10049}
diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
index 40e2fdb..3702fea 100644
--- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
@@ -405,9 +405,11 @@
capturer.stopCapture();
- // Dispose source and |capturer|.
+ // Dispose everything.
track.dispose();
source.dispose();
+ factory.dispose();
+
// The pending frames should keep the JNI parts and |capturer| alive.
assertFalse(capturer.isReleased());
@@ -426,7 +428,5 @@
// Check that frames have successfully returned. This will cause |capturer| to be released.
assertTrue(capturer.isReleased());
-
- factory.dispose();
}
}
