Delete MediaStreamManager in the same way as AudioManager

content/test/webrtc_audio_device_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/webrtc_audio_device_test.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
@@ skipping 206 matching lines @@
   has_input_devices_ = audio_manager_->HasAudioInputDevices();
   has_output_devices_ = audio_manager_->HasAudioOutputDevices();
 
   // Create an IPC channel that handles incoming messages on the IO thread.
   CreateChannel(thread_name);
 }
 
 void WebRTCAudioDeviceTest::UninitializeIOThread() {
   resource_context_.reset();
 
-  media_stream_manager_.reset();

[tommi (sloooow) - chröme, 2012/07/17 15:36:58]

hmm... should we reset this object and the audio_manager_ up where we do
|mock_process_.reset();|?  Maybe we should also create both the audio manager
and media stream managers inside SetUp() before we initialize the IO thread
(after we call |ui_thread_.reset|)?

[no longer working on chromium, 2012/07/17 17:18:25]

Good idea, it fits the current design more.
Another alternative might be that we do not reset the media_stream_manager_ and
audio_manager_ object explicitly.

   audio_manager_.reset();
   test_request_context_.reset();
   initialize_com_.reset();
 }
 
 void WebRTCAudioDeviceTest::CreateChannel(const char* name) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   audio_render_host_ = new AudioRendererHost(
       audio_manager_.get(), media_observer_.get());
   audio_render_host_->OnChannelConnected(base::GetCurrentProcId());
@@ skipping 128 matching lines @@
 WebRTCTransportImpl::~WebRTCTransportImpl() {}
 
 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
   return network_->ReceivedRTPPacket(channel, data, len);
 }
 
 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
                                         int len) {
   return network_->ReceivedRTCPPacket(channel, data, len);
 }