Removing singelton property of MediaStreamManager.

content/browser/renderer_host/media/video_capture_manager_unittest.cc

 // Copyright (c) 2011 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.
 
 // Unit test for VideoCaptureManager
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
@@ skipping 191 matching lines @@
 
   vcm_->EnumerateDevices();
 
   // Wait to get device callback...
   SyncWithVideoCaptureManagerThread();
 
   media_stream::StreamDeviceInfoArray::iterator it =
       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);
 
   vcm_->Close(video_session_id_first);
   vcm_->Close(video_session_id_second);
 
   // Wait to check callbacks before removing the listener
   SyncWithVideoCaptureManagerThread();
   vcm_->Unregister();
 }
@@ skipping 44 matching lines @@
   vcm_->Start(capture_params, frame_observer_.get());
 
   // Stop shall trigger the Close callback
   vcm_->Stop(media_stream::VideoCaptureManager::kStartOpenSessionId, NULL);
 
   // Wait to check callbacks before removing the listener
   SyncWithVideoCaptureManagerThread();
   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