delete the corresponding controller when a capture device is closed.

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 189 matching lines @@
 
   media::VideoCaptureDevice* video_capture_device = NULL;
   VideoCaptureDevices::iterator it = devices_.find(capture_session_id);
   if (it != devices_.end()) {
     video_capture_device = it->second;
     devices_.erase(it);
   }
   if (video_capture_device && !DeviceInUse(video_capture_device)) {
     // Deallocate (if not done already) and delete the device.
     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;
   }
 
   PostOnClosed(capture_session_id);
 }
 
 void VideoCaptureManager::OnStart(
     const media::VideoCaptureParams capture_params,
     media::VideoCaptureDevice::EventHandler* video_capture_receiver) {
   DCHECK(IsOnCaptureDeviceThread());
@@ skipping 291 matching lines @@
   for (VideoCaptureDevices::iterator it = devices_.begin();
        it != devices_.end(); ++it) {
     it->second->DeAllocate();
     devices_to_delete.insert(it->second);
   }
   STLDeleteElements(&devices_to_delete);
   STLDeleteValues(&controllers_);
 }
 
 }  // namespace media_stream