handle the case when device is closed before media pipeline is fully initialized.

content/browser/renderer_host/media/video_capture_manager.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/browser/renderer_host/media/video_capture_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/stl_util.h"
@@ skipping 176 matching lines @@
 
 void VideoCaptureManager::OnClose(int capture_session_id) {
   DCHECK(IsOnCaptureDeviceThread());
   DVLOG(1) << "VideoCaptureManager::OnClose, id " << capture_session_id;
 
   media::VideoCaptureDevice* video_capture_device = NULL;
   VideoCaptureDevices::iterator device_it = devices_.find(capture_session_id);
   if (device_it != devices_.end()) {
     video_capture_device = device_it->second;
     devices_.erase(device_it);
+
+    Controllers::iterator cit = controllers_.find(video_capture_device);
+    if (cit != controllers_.end()) {
+      BrowserThread::PostTask(
+          BrowserThread::IO, FROM_HERE,
+          base::Bind(&VideoCaptureController::StopSession,
+                     cit->second->controller, capture_session_id));
+    }
+
     if (!DeviceInUse(video_capture_device)) {
       // No other users of this device, deallocate (if not done already) and
       // delete the device. No need to take care of the controller, that is done
       // by |OnStop|.
       video_capture_device->DeAllocate();
       Controllers::iterator cit = controllers_.find(video_capture_device);
       if (cit != controllers_.end()) {
         delete cit->second;
         controllers_.erase(cit);
       }
       delete video_capture_device;
-    } else {
-      Controllers::iterator cit = controllers_.find(video_capture_device);
-      if (cit != controllers_.end()) {
-        BrowserThread::PostTask(
-            BrowserThread::IO, FROM_HERE,
-            base::Bind(&VideoCaptureController::StopSession,
-                       cit->second->controller, capture_session_id));
-      }
     }
   }
   PostOnClosed(capture_session_id);
 }
 
 void VideoCaptureManager::OnStart(
     const media::VideoCaptureParams capture_params,
     media::VideoCaptureDevice::EventHandler* video_capture_receiver) {
   DCHECK(IsOnCaptureDeviceThread());
   DCHECK(video_capture_receiver != NULL);
@@ skipping 282 matching lines @@
 
     VideoCaptureDevices::iterator dit = devices_.find(capture_session_id);
     if (dit != devices_.end()) {
       return dit->second;
     }
   }
   return NULL;
 }
 
 }  // namespace media_stream