Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

webkit/plugins/ppapi/ppb_video_capture_impl.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 "webkit/plugins/ppapi/ppb_video_capture_impl.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 274 matching lines @@
 void PPB_VideoCapture_Impl::SetRequestedInfo(
     const PP_VideoCaptureDeviceInfo_Dev& device_info,
     uint32_t buffer_count) {
   // Clamp the buffer count to between 1 and |kMaxBuffers|.
   buffer_count_hint_ = std::min(std::max(buffer_count, 1U), kMaxBuffers);
 
   capability_.width = device_info.width;
   capability_.height = device_info.height;
   capability_.frame_rate = device_info.frames_per_second;
   capability_.expected_capture_delay = 0;  // Ignored.
-  capability_.color = media::VideoFrame::I420;
+  capability_.color = media::VideoCaptureCapability::kI420;
   capability_.interlaced = false;  // Ignored.
 }
 
 void PPB_VideoCapture_Impl::DetachPlatformVideoCapture() {
   if (platform_video_capture_.get()) {
     platform_video_capture_->DetachEventHandler();
     platform_video_capture_ = NULL;
   }
 }
 
@@ skipping 12 matching lines @@
     : in_use(false),
       data(NULL),
       buffer() {
 }
 
 PPB_VideoCapture_Impl::BufferInfo::~BufferInfo() {
 }
 
 }  // namespace ppapi
 }  // namespace webkit