Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

content/renderer/media/media_stream_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/media_stream_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 450 matching lines @@
   std::string msm_label = ExtractManagerStreamLabel(source_id);
   if (msm_label.empty())
     return NULL;
 
   int video_session_id =
       media_stream_dispatcher_->video_session_id(msm_label, 0);
   media::VideoCaptureCapability capability;
   capability.width = kVideoCaptureWidth;
   capability.height = kVideoCaptureHeight;
   capability.frame_rate = kVideoCaptureFramePerSecond;
+  capability.color = media::VideoCaptureCapability::kI420;
   capability.expected_capture_delay = 0;
-  capability.color = media::VideoFrame::I420;
   capability.interlaced = false;
   return new CaptureVideoDecoder(
       message_loop_factory->GetMessageLoopProxy("CaptureVideoDecoderThread"),
       video_session_id,
       vc_manager_.get(),
       capability);
 }
 
 PeerConnectionHandlerBase* MediaStreamImpl::FindPeerConnectionBySource(
     const std::string& source_id) {
@@ skipping 22 matching lines @@
   return rtc_video_decoder;
 }
 
 MediaStreamImpl::VideoRendererWrapper::VideoRendererWrapper(
     RTCVideoDecoder* decoder)
     : rtc_video_decoder_(decoder) {
 }
 
 MediaStreamImpl::VideoRendererWrapper::~VideoRendererWrapper() {
 }