Revert 236927 "Reorganize media::VideoCapture* types"

trunk/src/content/renderer/media/rtc_video_capturer.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/renderer/media/rtc_video_capturer.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
-#include "media/base/video_frame.h"
 
 namespace content {
 
 RtcVideoCapturer::RtcVideoCapturer(const media::VideoCaptureSessionId id,
                                    VideoCaptureImplManager* vc_manager,
                                    bool is_screencast)
     : is_screencast_(is_screencast),
       delegate_(new RtcVideoCaptureDelegate(id, vc_manager)),
       state_(VIDEO_CAPTURE_STATE_STOPPED) {}
 
 RtcVideoCapturer::~RtcVideoCapturer() {
   DCHECK(VIDEO_CAPTURE_STATE_STOPPED);
   DVLOG(3) << " RtcVideoCapturer::dtor";
 }
 
 cricket::CaptureState RtcVideoCapturer::Start(
     const cricket::VideoFormat& capture_format) {
   DVLOG(3) << " RtcVideoCapturer::Start ";
   if (state_ == VIDEO_CAPTURE_STATE_STARTED) {
     DVLOG(1) << "Got a StartCapture when already started!!! ";
     return cricket::CS_FAILED;
   }
 
   media::VideoCaptureParams request;
-  request.requested_format = media::VideoCaptureFormat(
-      gfx::Size(capture_format.width, capture_format.height),
-      capture_format.framerate(),
-      media::PIXEL_FORMAT_I420);
+  request.requested_format =
+      media::VideoCaptureFormat(capture_format.width,
+                                capture_format.height,
+                                capture_format.framerate(),
+                                media::ConstantResolutionVideoCaptureDevice);
 
   SetCaptureFormat(&capture_format);
 
   state_ = VIDEO_CAPTURE_STATE_STARTED;
   first_frame_timestamp_ = media::kNoTimestamp();
   delegate_->StartCapture(
       request,
       base::Bind(&RtcVideoCapturer::OnFrameCaptured, base::Unretained(this)),
       base::Bind(&RtcVideoCapturer::OnStateChange, base::Unretained(this)));
   // Update the desired aspect ratio so that later the video frame can be
@@ skipping 102 matching lines @@
       converted_state = cricket::CS_FAILED;
       break;
     default:
       NOTREACHED();
       break;
   }
   SignalStateChange(this, converted_state);
 }
 
 }  // namespace content