Revert 235728 "Removed RunUntilIdle between Stop and Close in UT..."

trunk/src/content/browser/renderer_host/media/video_capture_controller.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_controller.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 135 matching lines @@
     base::ProcessHandle render_process,
     const media::VideoCaptureParams& params) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DVLOG(1) << "VideoCaptureController::AddClient, id " << id.device_id
            << ", (" << params.requested_format.width
            << ", " << params.requested_format.height
            << ", " << params.requested_format.frame_rate
            << ", " << params.session_id
            << ")";
 
-  // If this is the first client added to the controller, cache the parameters.
-  if (!controller_clients_.size())
-    video_capture_format_ = params.requested_format;
-
   // Signal error in case device is already in error state.
   if (state_ == VIDEO_CAPTURE_STATE_ERROR) {
     event_handler->OnError(id);
     return;
   }
 
   // Do nothing if this client has called AddClient before.
   if (FindClient(id, event_handler, controller_clients_))
     return;
 
@@ skipping 56 matching lines @@
   // If this buffer is not held by this client, or this client doesn't exist
   // in controller, do nothing.
   if (!client || !client->active_buffers.erase(buffer_id)) {
     NOTREACHED();
     return;
   }
 
   buffer_pool_->RelinquishConsumerHold(buffer_id, 1);
 }
 
-const media::VideoCaptureFormat&
-VideoCaptureController::GetVideoCaptureFormat() const {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  return video_capture_format_;
-}
-
 scoped_refptr<media::VideoFrame>
 VideoCaptureController::VideoCaptureDeviceClient::ReserveOutputBuffer(
     const gfx::Size& size) {
   return DoReserveI420VideoFrame(size, 0);
 }
 
 void VideoCaptureController::VideoCaptureDeviceClient::OnIncomingCapturedFrame(
     const uint8* data,
     int length,
     base::Time timestamp,
@@ skipping 316 matching lines @@
   }
   return NULL;
 }
 
 int VideoCaptureController::GetClientCount() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return controller_clients_.size();
 }
 
 }  // namespace content