commit 79c143312b78a790818242bd468002b0f7a0315e
author Minyue Li <minyue@webrtc.org> Mon May 04 11:21:00 2015 +0200
committer Minyue Li <minyue@webrtc.org> Mon May 04 09:21:00 2015 +0000
tree ec80e17f5df108d0aa6c284772ce56508212bacd
parent 0b15445fd52e6b524e4ccbadccee7f384f76d573

Delete VoiceChannelTransport before deleting Channel in voe_cmd_test

Current voe_cmd_test shows following error when quitting:
DeRegisterExternalTransport() failed to locate channel.

This is to fix it.

BUG=
R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/45349004

Cr-Commit-Position: refs/heads/master@{#9129}

webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc

diff --git a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
index 9133a07..ee9306d 100644
--- a/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
+++ b/webrtc/voice_engine/test/cmd_test/voe_cmd_test.cc
@@ -260,7 +260,7 @@
     fflush(NULL);
   }
 
-  rtc::scoped_ptr<VoiceChannelTransport> voice_channel_transport(
+  VoiceChannelTransport* voice_channel_transport(
       new VoiceChannelTransport(netw, chan));
 
   char ip[64];
@@ -845,6 +845,9 @@
     newcall = (end_option == 1);
     // Call loop
   }
+
+  // Transports should be deleted before channel deletion.
+  delete voice_channel_transport;
   for (int i = 0; i < kMaxNumChannels; ++i) {
     delete voice_channel_transports[i];
     voice_channel_transports[i] = NULL;
@@ -855,7 +858,7 @@
   VALIDATE;
 
   for (int i = 0; i < kMaxNumChannels; ++i) {
-    channels[i] = base1->DeleteChannel(channels[i]);
+    res = base1->DeleteChannel(channels[i]);
     VALIDATE;
   }
 }