Refactor stopCapture to be asynchronous in VideoCapturerAndroid.

webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java

Index: webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
diff --git a/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java b/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
index 4c933db0e33ec68b53b5cf1285fda526ff921baa..eb6d91d443ed2ac8dc0b28b0bbb87c47a335ca0a 100644
--- a/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
+++ b/webrtc/api/androidtests/src/org/webrtc/CameraVideoCapturerTestFixtures.java
@@ -402,8 +402,8 @@ class CameraVideoCapturerTestFixtures {
     final VideoTrackWithRenderer videoTrackWithRenderer =
         createVideoTrackWithRenderer(capturerInstance.capturer);
     assertTrue(videoTrackWithRenderer.rendererCallbacks.waitForNextFrameToRender() > 0);
-    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
     disposeCapturer(capturerInstance);
+    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
   }
 
   // Test methods
@@ -466,8 +466,8 @@ class CameraVideoCapturerTestFixtures {
     assertTrue(cameraSwitchSuccessful[0]);
     // Ensure that frames are received.
     assertTrue(videoTrackWithRenderer.rendererCallbacks.waitForNextFrameToRender() > 0);
-    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
     disposeCapturer(capturerInstance);
+    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
   }
 
   public void cameraEventsInvoked() throws InterruptedException {
@@ -514,8 +514,8 @@ class CameraVideoCapturerTestFixtures {
     assertTrue(videoTrackWithRenderer.rendererCallbacks.waitForNextFrameToRender() > 0);
     assertEquals(MediaSource.State.LIVE, videoTrackWithRenderer.source.state());
 
-    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
     disposeCapturer(capturerInstance);
+    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
   }
 
   public void startStopWithDifferentResolutions() throws InterruptedException {
@@ -585,8 +585,8 @@ class CameraVideoCapturerTestFixtures {
     capturerInstance.capturer.stopCapture();
 
     // Dispose everything.
-    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
     disposeCapturer(capturerInstance);
+    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
 
     // Return the frame(s), on a different thread out of spite.
     final List<I420Frame> pendingFrames =
@@ -643,8 +643,8 @@ class CameraVideoCapturerTestFixtures {
           &&  videoTrackWithRenderer.rendererCallbacks.frameHeight() == scaledHeight);
     } while (!gotExpectedResolution && numberOfInspectedFrames < 30);
 
-    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
     disposeCapturer(capturerInstance);
+    disposeVideoTrackWithRenderer(videoTrackWithRenderer);
 
     assertTrue(gotExpectedResolution);
   }