Consolidate duplicated frame / capability structures in video_capture_types.h

content/browser/renderer_host/media/desktop_capture_device.cc

 // Copyright (c) 2013 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/browser/renderer_host/media/desktop_capture_device.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 245 matching lines @@
       base::Time::kMillisecondsPerSecond / requested_format_.frame_rate;
 
   // Support dynamic changes in resolution only if requester also does.
   if (requested_format_.frame_size_type ==
       media::VariableResolutionVideoCaptureDevice) {
     capture_format_.frame_size_type =
         media::VariableResolutionVideoCaptureDevice;
   }
 
   // This capturer always outputs ARGB, non-interlaced.
-  capture_format_.color = media::VideoCaptureCapability::kARGB;
+  capture_format_.color = media::PIXEL_FORMAT_ARGB;
   capture_format_.interlaced = false;
 
   desktop_capturer_->Start(this);
 
   // Capture first frame, so that we can call OnFrameInfo() callback.
   DoCapture();
 }
 
 void DesktopCaptureDevice::Core::DoStart() {
   DCHECK(task_runner_->RunsTasksOnCurrentThread());
@@ skipping 176 matching lines @@
 
 void DesktopCaptureDevice::DeAllocate() {
   core_->DeAllocate();
 }
 
 const media::VideoCaptureDevice::Name& DesktopCaptureDevice::device_name() {
   return name_;
 }
 
 }  // namespace content