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 115 matching lines @@
   // This part sets up a RenderThread environment to ensure that
   // RenderThread::current() (<=> TLS pointer) is valid.
   // Main parts are inspired by the RenderViewFakeResourcesTest.
   // Note that, the IPC part is not utilized in this test.
   saved_content_renderer_.reset(
       new ReplaceContentClientRenderer(&content_renderer_client_));
   mock_process_.reset(new WebRTCMockRenderProcess());
   ui_thread_.reset(new content::TestBrowserThread(content::BrowserThread::UI,
                                                   MessageLoop::current()));
 
+  // Create our own AudioManager and MediaStreamManager.
+  audio_manager_.reset(media::AudioManager::Create());
+
+  scoped_refptr<media_stream::AudioInputDeviceManager>
+      audio_input_device_manager(new media_stream::AudioInputDeviceManager(
+          audio_manager_.get()));
+  scoped_refptr<media_stream::VideoCaptureManager> video_capture_manager(
+      new media_stream::VideoCaptureManager());
+  media_stream_manager_.reset(new media_stream::MediaStreamManager(
+      audio_input_device_manager, video_capture_manager));
+
   // Construct the resource context on the UI thread.
   resource_context_.reset(new MockResourceContext);
 
   static const char kThreadName[] = "RenderThread";
   ChildProcess::current()->io_message_loop()->PostTask(FROM_HERE,
       base::Bind(&WebRTCAudioDeviceTest::InitializeIOThread,
                  base::Unretained(this), kThreadName));
   WaitForIOThreadCompletion();
 
   sandbox_was_enabled_ =
@@ skipping 20 matching lines @@
   // the IO thread to actually delete the AudioEntry for the audio stream. Only
   // then is the reference to the audio manager released, so we wait for the
   // whole thing to be torn down before we finally uninitialize the io thread.
   WaitForAudioManagerCompletion();
 
   ChildProcess::current()->io_message_loop()->PostTask(FROM_HERE,
       base::Bind(&WebRTCAudioDeviceTest::UninitializeIOThread,
                  base::Unretained((this))));
   WaitForIOThreadCompletion();
   mock_process_.reset();
+  media_stream_manager_.reset();
+  audio_manager_.reset();
   RendererWebKitPlatformSupportImpl::SetSandboxEnabledForTesting(
       sandbox_was_enabled_);
 }
 
 bool WebRTCAudioDeviceTest::Send(IPC::Message* message) {
   return channel_->Send(message);
 }
 
 void WebRTCAudioDeviceTest::SetAudioUtilCallback(AudioUtilInterface* callback) {
   // Invalidate any potentially cached values since the new callback should
   // be used for those queries.
   audio_hardware::ResetCache();
   audio_util_callback_ = callback;
 }
 
 void WebRTCAudioDeviceTest::InitializeIOThread(const char* thread_name) {
   // We initialize COM (STA) on our IO thread as is done in Chrome.
   // See BrowserProcessSubThread::Init.
   initialize_com_.reset(new ScopedCOMInitializer());
 
   // Set the current thread as the IO thread.
   io_thread_.reset(new content::TestBrowserThread(content::BrowserThread::IO,
                                                   MessageLoop::current()));
 
-  audio_manager_.reset(media::AudioManager::Create());
-
-  scoped_refptr<media_stream::AudioInputDeviceManager>
-      audio_input_device_manager(new media_stream::AudioInputDeviceManager(
-          audio_manager_.get()));
-  scoped_refptr<media_stream::VideoCaptureManager> video_capture_manager(
-      new media_stream::VideoCaptureManager());
-  media_stream_manager_.reset(new media_stream::MediaStreamManager(
-      audio_input_device_manager, video_capture_manager));
-
   // Populate our resource context.
   test_request_context_.reset(new TestURLRequestContext());
   MockResourceContext* resource_context =
       static_cast<MockResourceContext*>(resource_context_.get());
   resource_context->set_request_context(test_request_context_.get());
   media_observer_.reset(new MockMediaObserver());
 
   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();
-  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 127 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);
 }