Bug 864255 - Fix mediapipeline_unittests to match new assertion. r=ekr, a=akeybl
authorRandell Jesup <rjesup@jesup.org>
Mon, 13 May 2013 01:03:30 -0400
changeset 142646 1ae698514fce130ac6edcc466778b6b68185eb03
parent 142645 3f233890047ea6a88c7185e1dc64e67c9dea1276
child 142647 d8161fba947ca46159f2535b6b9c37a702eeca3f
push id2579
push userakeybl@mozilla.com
push dateMon, 24 Jun 2013 18:52:47 +0000
treeherdermozilla-beta@b69b7de8a05a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersekr, akeybl
bugs864255
milestone23.0a2
Bug 864255 - Fix mediapipeline_unittests to match new assertion. r=ekr, a=akeybl
media/webrtc/signaling/test/mediapipeline_unittest.cpp
--- a/media/webrtc/signaling/test/mediapipeline_unittest.cpp
+++ b/media/webrtc/signaling/test/mediapipeline_unittest.cpp
@@ -104,24 +104,25 @@ class TestAgent {
       audio_pipeline_->ShutdownTransport_s();
     if (video_pipeline_)
       video_pipeline_->ShutdownTransport_s();
   }
 
   void Stop() {
     MOZ_MTLOG(PR_LOG_DEBUG, "Stopping");
 
+    if (audio_pipeline_)
+      audio_pipeline_->ShutdownMedia_m();
+    if (video_pipeline_)
+      video_pipeline_->ShutdownMedia_m();
+
     mozilla::SyncRunnable::DispatchToThread(
       test_utils->sts_target(),
       WrapRunnable(this, &TestAgent::StopInt));
 
-    if (audio_pipeline_)
-      audio_pipeline_->ShutdownMedia_m();
-    if (video_pipeline_)
-      video_pipeline_->ShutdownMedia_m();
     audio_pipeline_ = NULL;
     video_pipeline_ = NULL;
 
     PR_Sleep(1000); // Deal with race condition
   }
 
 
  protected: