Add OnRemoved() in VideoCapture::EventHandler API

content/renderer/media/video_capture_impl.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/renderer/media/video_capture_impl.h"
 
 #include "base/stl_util.h"
 #include "content/common/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 
@@ skipping 126 matching lines @@
 
 void VideoCaptureImpl::DoStartCapture(
     media::VideoCapture::EventHandler* handler,
     const VideoCaptureCapability& capability) {
   DCHECK(ml_proxy_->BelongsToCurrentThread());
 
   ClientInfo::iterator it = pending_clients_.find(handler);
 
   if (it != pending_clients_.end()) {
     handler->OnError(this, 1);
+    handler->OnRemoved(this);
     return;
   }
 
   if (!device_id_) {
     pending_clients_[handler] = capability;
     return;
   }
 
   if (capability.resolution_fixed && master_clients_.size() &&
       (capability.width != current_params_.width ||
        capability.height != current_params_.height)) {
     // Can't have 2 master clients with different resolutions.
     handler->OnError(this, 1);
+    handler->OnRemoved(this);
     return;
   }
 
   clients_[handler] = capability;
   if (capability.resolution_fixed) {
     master_clients_.push_back(handler);
     if (master_clients_.size() > 1)
       return;
   }
 
@@ skipping 42 matching lines @@
   StartCaptureInternal();
 }
 
 void VideoCaptureImpl::DoStopCapture(
     media::VideoCapture::EventHandler* handler) {
   DCHECK(ml_proxy_->BelongsToCurrentThread());
 
   ClientInfo::iterator it = pending_clients_.find(handler);
   if (it != pending_clients_.end()) {
     handler->OnStopped(this);
+    handler->OnRemoved(this);
     pending_clients_.erase(it);
     return;
   }
 
   if (clients_.find(handler) == clients_.end())
     return;
 
   handler->OnStopped(this);
+  handler->OnRemoved(this);
   clients_.erase(handler);
   master_clients_.remove(handler);
 
   // Still have at least one master client.
   if (master_clients_.size() > 0)
     return;
 
   // TODO(wjia): Is it really needed to handle resolution change for non-master
   // clients, except no client case?
   if (clients_.size() > 0) {
@@ skipping 121 matching lines @@
       for (ClientInfo::iterator it = clients_.begin();
            it != clients_.end(); it++) {
         it->first->OnPaused(this);
       }
       break;
     case media::VideoCapture::kError:
       for (ClientInfo::iterator it = clients_.begin();
            it != clients_.end(); it++) {
         // TODO(wjia): browser process would send error code.
         it->first->OnError(this, 1);
+        it->first->OnRemoved(this);
       }
+      clients_.clear();
+      master_clients_.clear();
+      state_ = kStopped;
+      current_params_.width = current_params_.height = 0;
       break;
     default:
       break;
   }
 }
 
 void VideoCaptureImpl::DoDeviceInfoReceived(
     const media::VideoCaptureParams& device_info) {
   DCHECK(ml_proxy_->BelongsToCurrentThread());
 
@@ skipping 64 matching lines @@
 }
 
 void VideoCaptureImpl::Send(IPC::Message* message) {
   base::MessageLoopProxy* io_message_loop_proxy =
       ChildProcess::current()->io_message_loop_proxy();
 
   io_message_loop_proxy->PostTask(FROM_HERE,
       NewRunnableMethod(message_filter_.get(),
                         &VideoCaptureMessageFilter::Send, message));
 }