Change class VideoCaptureDevice::Name to struct VideoCaptureDeviceDescriptor

media/capture/video/linux/v4l2_capture_delegate.cc

 // Copyright 2015 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 "media/capture/video/linux/v4l2_capture_delegate.h"
 
 #include <poll.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ skipping 139 matching lines @@
     supported_formats.push_back(format.fourcc);
 
   // Duplicate MJPEG on top of the list depending on |prefer_mjpeg|.
   if (prefer_mjpeg)
     supported_formats.push_front(V4L2_PIX_FMT_MJPEG);
 
   return supported_formats;
 }
 
 V4L2CaptureDelegate::V4L2CaptureDelegate(
-    const VideoCaptureDevice::Name& device_name,
+    const VideoCaptureDeviceDescriptor& device_descriptor,
     const scoped_refptr<base::SingleThreadTaskRunner>& v4l2_task_runner,
     int power_line_frequency)
     : v4l2_task_runner_(v4l2_task_runner),
-      device_name_(device_name),
+      device_descriptor_(device_descriptor),
       power_line_frequency_(power_line_frequency),
       is_capturing_(false),
       timeout_count_(0),
       rotation_(0) {}
 
 void V4L2CaptureDelegate::AllocateAndStart(
     int width,
     int height,
     float frame_rate,
     std::unique_ptr<VideoCaptureDevice::Client> client) {
   DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
   DCHECK(client);
   client_ = std::move(client);
 
   // Need to open camera with O_RDWR after Linux kernel 3.3.
-  device_fd_.reset(HANDLE_EINTR(open(device_name_.id().c_str(), O_RDWR)));
+  device_fd_.reset(
+      HANDLE_EINTR(open(device_descriptor_.device_id.c_str(), O_RDWR)));
   if (!device_fd_.is_valid()) {
     SetErrorState(FROM_HERE, "Failed to open V4L2 device driver file.");
     return;
   }
 
   v4l2_capability cap = {};
   if (!((HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_QUERYCAP, &cap)) == 0) &&
         ((cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) &&
          !(cap.capabilities & V4L2_CAP_VIDEO_OUTPUT)))) {
     device_fd_.reset();
@@ skipping 246 matching lines @@
     DLOG(ERROR) << "Error mmap()ing a V4L2 buffer into userspace";
     return false;
   }
   start_ = static_cast<uint8_t*>(start);
   length_ = buffer.length;
   payload_size_ = 0;
   return true;
 }
 
 }  // namespace media