BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 6 insertions, 5 deletions

diff --git a/chromium/content/browser/serial/serial_service.cc b/chromium/content/browser/serial/serial_service.cc
index 918d558253a..d3069192e1a 100644
--- a/chromium/content/browser/serial/serial_service.cc
+++ b/chromium/content/browser/serial/serial_service.cc
@@ -28,12 +28,12 @@ blink::mojom::SerialPortInfoPtr ToBlinkType(
     const device::mojom::SerialPortInfo& port) {
   auto info = blink::mojom::SerialPortInfo::New();
   info->token = port.token;
-  info->has_vendor_id = port.has_vendor_id;
+  info->has_usb_vendor_id = port.has_vendor_id;
   if (port.has_vendor_id)
-    info->vendor_id = port.vendor_id;
-  info->has_product_id = port.has_product_id;
+    info->usb_vendor_id = port.vendor_id;
+  info->has_usb_product_id = port.has_product_id;
   if (port.has_product_id)
-    info->product_id = port.product_id;
+    info->usb_product_id = port.product_id;
   return info;
 }
 
@@ -126,7 +126,8 @@ void SerialService::GetPort(
   mojo::PendingRemote<device::mojom::SerialPortConnectionWatcher> watcher;
   watchers_.Add(this, watcher.InitWithNewPipeAndPassReceiver());
   delegate->GetPortManager(render_frame_host_)
-      ->GetPort(token, std::move(receiver), std::move(watcher));
+      ->GetPort(token, /*use_alternate_path=*/false, std::move(receiver),
+                std::move(watcher));
 }
 
 void SerialService::OnPortAdded(const device::mojom::SerialPortInfo& port) {