Removing singelton property of MediaStreamManager.

content/browser/renderer_host/media/video_capture_manager_unittest.cc

Index: content/browser/renderer_host/media/video_capture_manager_unittest.cc
diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
index 1a4b7a06c68574faeb1ba26c47c9a04c47130d44..a93f1839f7955395c9c29339b582940670039f29 100644
--- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc
+++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc
@@ -209,8 +209,6 @@ TEST_F(VideoCaptureManagerTest, OpenTwo) {
       listener_->devices_.begin();
 
   int video_session_id_first = vcm_->Open(*it);
-
-  // This should trigger an error callback with error code 'kDeviceAlreadyInUse'
   ++it;
   int video_session_id_second = vcm_->Open(*it);
 
@@ -275,4 +273,33 @@ TEST_F(VideoCaptureManagerTest, StartUsingId) {
   vcm_->Unregister();
 }
 
+// TODO(mflodman) Remove test case below when shut-down bug is resolved, this is
+// only to verify this temporary solution is ok in regards to the
+// VideoCaptureManager.
+// Open the devices and delete manager.
+TEST_F(VideoCaptureManagerTest, DeleteManager) {
+  InSequence s;
+  EXPECT_CALL(*listener_, DevicesEnumerated(_))
+    .Times(1);
+  EXPECT_CALL(*listener_, Opened(media_stream::kVideoCapture, _))
+    .Times(2);
+
+  vcm_->EnumerateDevices();
+
+  // Wait to get device callback...
+  SyncWithVideoCaptureManagerThread();
+
+  media_stream::StreamDeviceInfoArray::iterator it =
+      listener_->devices_.begin();
+  vcm_->Open(*it);
+  ++it;
+  vcm_->Open(*it);
+
+  // Wait to check callbacks before removing the listener
+  SyncWithVideoCaptureManagerThread();
+
+  // Delete the manager.
+  vcm_.reset();
+}
+
 }  // namespace