Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/media/video/capture/video_capture_proxy.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 "media/video/capture/video_capture_proxy.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
-#include "media/base/video_frame.h"
 
 namespace {
 
 // Called on VC thread: extracts the state out of the VideoCapture, and
 // serialize it into a VideoCaptureState.
 media::VideoCaptureHandlerProxy::VideoCaptureState GetState(
     media::VideoCapture* capture) {
   media::VideoCaptureHandlerProxy::VideoCaptureState state;
   state.started = capture->CaptureStarted();
   state.frame_rate = capture->CaptureFrameRate();
@@ skipping 105 matching lines @@
 
 void VideoCaptureHandlerProxy::OnFrameReadyOnMainThread(
     VideoCapture* capture,
     const VideoCaptureState& state,
     const scoped_refptr<VideoFrame>& frame) {
   state_ = state;
   proxied_->OnFrameReady(capture, frame);
 }
 
 }  // namespace media