Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/renderer/media/video_capture_module_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 "content/renderer/media/video_capture_module_impl.h"
 
 #include "base/atomicops.h"
 #include "base/bind.h"
 #include "content/renderer/media/video_capture_impl_manager.h"
 
@@ skipping 134 matching lines @@
   video_type_ = capability.rawType;
   width_ = capability.width;
   height_ = capability.height;
   frame_rate_ = capability.maxFPS;
   state_ = video_capture::kStarted;
 
   media::VideoCaptureCapability cap;
   cap.width = capability.width;
   cap.height = capability.height;
   cap.frame_rate = capability.maxFPS;
-  cap.color = media::VideoFrame::I420;
+  cap.color = media::VideoCaptureCapability::kI420;
   capture_engine_->StartCapture(this, cap);
 }
 
 void VideoCaptureModuleImpl::StopCaptureOnCaptureThread() {
   DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 
   if (state_ != video_capture::kStarted) {
     DVLOG(1) << "Got a StopCapture while not started!!! ";
     return;
   }
@@ skipping 25 matching lines @@
 
   IncomingFrame(
       static_cast<WebRtc_UWord8*>(buf->memory_pointer),
       static_cast<WebRtc_Word32>(buf->buffer_size),
       frameInfo_,
       static_cast<WebRtc_Word64>(
           (buf->timestamp - start_time_).InMilliseconds()));
 
   capture->FeedBuffer(buf);
 }