BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 25 insertions, 19 deletions

diff --git a/chromium/third_party/blink/common/mediastream/media_devices.cc b/chromium/third_party/blink/common/mediastream/media_devices.cc
index 3661b4b6587..0a67e4592ee 100644
--- a/chromium/third_party/blink/common/mediastream/media_devices.cc
+++ b/chromium/third_party/blink/common/mediastream/media_devices.cc
@@ -7,28 +7,31 @@
 
 namespace blink {
 
-WebMediaDeviceInfo::WebMediaDeviceInfo()
-    : video_facing(media::VideoFacingMode::MEDIA_VIDEO_FACING_NONE) {}
+WebMediaDeviceInfo::WebMediaDeviceInfo() = default;
 
 WebMediaDeviceInfo::WebMediaDeviceInfo(const WebMediaDeviceInfo& other) =
     default;
 
 WebMediaDeviceInfo::WebMediaDeviceInfo(WebMediaDeviceInfo&& other) = default;
 
-WebMediaDeviceInfo::WebMediaDeviceInfo(const std::string& device_id,
-                                       const std::string& label,
-                                       const std::string& group_id,
-                                       media::VideoFacingMode video_facing)
+WebMediaDeviceInfo::WebMediaDeviceInfo(
+    const std::string& device_id,
+    const std::string& label,
+    const std::string& group_id,
+    media::VideoFacingMode video_facing,
+    const base::Optional<bool>& pan_tilt_zoom_supported)
     : device_id(device_id),
       label(label),
       group_id(group_id),
-      video_facing(video_facing) {}
+      video_facing(video_facing),
+      pan_tilt_zoom_supported(pan_tilt_zoom_supported) {}
 
 WebMediaDeviceInfo::WebMediaDeviceInfo(
     const media::VideoCaptureDeviceDescriptor& descriptor)
     : device_id(descriptor.device_id),
       label(descriptor.GetNameAndModel()),
-      video_facing(descriptor.facing) {}
+      video_facing(descriptor.facing),
+      pan_tilt_zoom_supported(descriptor.pan_tilt_zoom_supported()) {}
 
 WebMediaDeviceInfo::~WebMediaDeviceInfo() = default;
 
diff --git a/chromium/third_party/blink/common/mediastream/media_stream_request.cc b/chromium/third_party/blink/common/mediastream/media_stream_request.cc
index 39323c1819c..a870fc4ea38 100644
--- a/chromium/third_party/blink/common/mediastream/media_stream_request.cc
+++ b/chromium/third_party/blink/common/mediastream/media_stream_request.cc
@@ -69,11 +69,13 @@ MediaStreamDevice::MediaStreamDevice(
     const std::string& id,
     const std::string& name,
     media::VideoFacingMode facing,
-    const base::Optional<std::string>& group_id)
+    const base::Optional<std::string>& group_id,
+    const base::Optional<bool>& pan_tilt_zoom_supported)
     : type(type),
       id(id),
       video_facing(facing),
       group_id(group_id),
+      pan_tilt_zoom_supported(pan_tilt_zoom_supported),
       name(name) {}
 
 MediaStreamDevice::MediaStreamDevice(mojom::MediaStreamType type,
@@ -93,21 +95,22 @@ MediaStreamDevice::MediaStreamDevice(mojom::MediaStreamType type,
   DCHECK(input.IsValid());
 }
 
-MediaStreamDevice::MediaStreamDevice(const MediaStreamDevice& other) {
-  type = other.type;
-  id = other.id;
-  video_facing = other.video_facing;
-  group_id = other.group_id;
-  matched_output_device_id = other.matched_output_device_id;
-  name = other.name;
-  input = other.input;
-  session_id_ = other.session_id_;
+MediaStreamDevice::MediaStreamDevice(const MediaStreamDevice& other)
+    : type(other.type),
+      id(other.id),
+      video_facing(other.video_facing),
+      group_id(other.group_id),
+      pan_tilt_zoom_supported(other.pan_tilt_zoom_supported),
+      matched_output_device_id(other.matched_output_device_id),
+      name(other.name),
+      input(other.input),
+      session_id_(other.session_id_) {
   DCHECK(!session_id_.has_value() || !session_id_->is_empty());
   if (other.display_media_info.has_value())
     display_media_info = other.display_media_info->Clone();
 }
 
-MediaStreamDevice::~MediaStreamDevice() {}
+MediaStreamDevice::~MediaStreamDevice() = default;
 
 MediaStreamDevice& MediaStreamDevice::operator=(
     const MediaStreamDevice& other) {