Changed VideoCaptureController to use correct session id when stopping the capture device.

content/browser/renderer_host/media/video_capture_controller.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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_controller.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/media/media_stream_manager.h"
 #include "content/browser/renderer_host/media/video_capture_manager.h"
@@ skipping 171 matching lines @@
     // Normal way to stop capture.
     if (!client->buffers.empty()) {
       // There are still some buffers held by the client.
       client->report_ready_to_delete = true;
       return;
     }
     // No buffer is held by the client. Ready to delete.
     client->event_handler->OnReadyToDelete(client->controller_id);
   }
 
+  int session_id = client->parameters.session_id;
   delete client;
   controller_clients_.remove(client);
 
   // No more clients. Stop device.
   if (controller_clients_.empty()) {
-    video_capture_manager_->Stop(current_params_.session_id,
+    video_capture_manager_->Stop(session_id,
         base::Bind(&VideoCaptureController::OnDeviceStopped, this));
     frame_info_available_ = false;
     state_ = video_capture::kStopping;
   }
 }
 
 void VideoCaptureController::ReturnBuffer(
     const VideoCaptureControllerID& id,
     VideoCaptureControllerEventHandler* event_handler,
     int buffer_id) {
@@ skipping 314 matching lines @@
 }
 
 void VideoCaptureController::DoDeviceStoppedOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   device_in_use_ = false;
   if (state_ == video_capture::kStopping) {
     PostStopping();
   }
 }