Delete MediaStreamManager in the same way as AudioManager

content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.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 <string>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/renderer_host/media/audio_input_device_manager.h"
@@ skipping 182 matching lines @@
     content_client_->set_browser_for_testing(host_);
   }
 
   virtual void TearDown() OVERRIDE {
     message_loop_->RunAllPending();
 
     // Recover the old browser client and content client.
     content::GetContentClient()->set_browser_for_testing(old_browser_client_);
     content::SetContentClient(old_client_);
     content_client_.reset();
+
+    // Delete the IO message loop to delete the device thread and managers.
+    message_loop_.reset();

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

Did you have to add this explicitly?  This doesn't delete the
media_stream_manager_, right (which managers does it delete?)?

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

This deletes the device thread, AudioInputDeviceManager and VideoCaptureManager
(they are deleted when the IO loop goes away). So we need to do it explicit,
otherwise it will hit the DCHECKs in the destructor of MediaStreamManager.

   }
 
   scoped_refptr<MockMediaStreamDispatcherHost> host_;
   scoped_ptr<MessageLoop> message_loop_;
   scoped_ptr<BrowserThreadImpl> io_thread_;
   scoped_ptr<media::AudioManager> audio_manager_;
   scoped_ptr<MediaStreamManager> media_stream_manager_;
   content::ContentClient* old_client_;
   content::ContentBrowserClient* old_browser_client_;
   scoped_ptr<content::ContentClient> content_client_;
@@ skipping 118 matching lines @@
   EXPECT_EQ(host_->video_devices_.size(), 0u);
   EXPECT_EQ(host_->NumberOfStreams(), 1u);
 
   // TODO(perkj): test audio device failure?
 
   host_->OnStopGeneratedStream(label);
   EXPECT_EQ(host_->NumberOfStreams(), 0u);
 }
 
 };  // namespace media_stream