Removing singelton property of MediaStreamManager.

content/browser/renderer_host/media/video_capture_manager.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.
 
 #include "content/browser/renderer_host/media/video_capture_manager.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_thread.h"
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/video_capture_device.h"
 
 namespace media_stream {
 
 // Starting id for the first capture session.
 // VideoCaptureManager::kStartOpenSessionId is used as default id without
 // explicitly calling open device.
 enum { kFirstSessionId = VideoCaptureManager::kStartOpenSessionId + 1 };
 
 VideoCaptureManager::VideoCaptureManager()
   : vc_device_thread_("VideoCaptureManagerThread"),
     listener_(NULL),
     new_capture_session_id_(kFirstSessionId),
     use_fake_device_(false) {
   vc_device_thread_.Start();
 }
 
 VideoCaptureManager::~VideoCaptureManager() {
-  DCHECK(devices_.empty());
   vc_device_thread_.Stop();
+  // TODO(mflodman) Remove this temporary solution when shut-down issue is
+  // resolved, i.e. all code below this comment.
+  // Temporary solution: close all open devices and delete them, after the
+  // thread is stopped.
+  DLOG_IF(ERROR, !devices_.empty()) << "VideoCaptureManager: Open devices!";
+  for (VideoCaptureDevices::iterator it = devices_.begin();
+       it != devices_.end();
+       ++it) {
+    it->second->DeAllocate();
+    delete it->second;
+  }
 }
 
 void VideoCaptureManager::Register(MediaStreamProviderListener* listener) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!listener_);
   listener_ = listener;
 }
 
 void VideoCaptureManager::Unregister() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
@@ skipping 325 matching lines @@
       it != devices_.end();
       it++) {
     if (device_info.device_id == it->second->device_name().unique_id) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace media_stream