BASELINE: Update Chromium to 85.0.4183.14085-based

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

9 files changed, 21 insertions, 0 deletions

diff --git a/chromium/device/udev_linux/fake_udev_loader.cc b/chromium/device/udev_linux/fake_udev_loader.cc
index c825ec1b86e..885f5effdf2 100644
--- a/chromium/device/udev_linux/fake_udev_loader.cc
+++ b/chromium/device/udev_linux/fake_udev_loader.cc
@@ -74,6 +74,10 @@ const char* FakeUdevLoader::udev_device_get_devnode(udev_device* udev_device) {
   return nullptr;
 }
 
+const char* FakeUdevLoader::udev_device_get_devtype(udev_device* udev_device) {
+  return nullptr;
+}
+
 udev_device* FakeUdevLoader::udev_device_get_parent(udev_device* udev_device) {
   if (!udev_device) {
     return nullptr;
diff --git a/chromium/device/udev_linux/fake_udev_loader.h b/chromium/device/udev_linux/fake_udev_loader.h
index da6d8d61f2c..8a52b091be7 100644
--- a/chromium/device/udev_linux/fake_udev_loader.h
+++ b/chromium/device/udev_linux/fake_udev_loader.h
@@ -31,6 +31,7 @@ class FakeUdevLoader : public device::UdevLoader {
   bool Init() override;
   const char* udev_device_get_action(udev_device* udev_device) override;
   const char* udev_device_get_devnode(udev_device* udev_device) override;
+  const char* udev_device_get_devtype(udev_device* udev_device) override;
   udev_device* udev_device_get_parent(udev_device* udev_device) override;
   udev_device* udev_device_get_parent_with_subsystem_devtype(
       udev_device* udev_device,
diff --git a/chromium/device/udev_linux/udev.cc b/chromium/device/udev_linux/udev.cc
index 2c6d27e4c4f..b27829203c2 100644
--- a/chromium/device/udev_linux/udev.cc
+++ b/chromium/device/udev_linux/udev.cc
@@ -27,6 +27,10 @@ const char* udev_device_get_devnode(udev_device* udev_device) {
   return UdevLoader::Get()->udev_device_get_devnode(udev_device);
 }
 
+const char* udev_device_get_devtype(udev_device* udev_device) {
+  return UdevLoader::Get()->udev_device_get_devtype(udev_device);
+}
+
 udev_device* udev_device_get_parent(udev_device* udev_device) {
   return UdevLoader::Get()->udev_device_get_parent(udev_device);
 }
diff --git a/chromium/device/udev_linux/udev.h b/chromium/device/udev_linux/udev.h
index f2670638d61..65ff7b2eef1 100644
--- a/chromium/device/udev_linux/udev.h
+++ b/chromium/device/udev_linux/udev.h
@@ -31,6 +31,7 @@ namespace device {
 
 const char* udev_device_get_action(udev_device* udev_device);
 const char* udev_device_get_devnode(udev_device* udev_device);
+const char* udev_device_get_devtype(udev_device* udev_device);
 udev_device* udev_device_get_parent(udev_device* udev_device);
 udev_device* udev_device_get_parent_with_subsystem_devtype(
     udev_device* udev_device,
diff --git a/chromium/device/udev_linux/udev0_loader.cc b/chromium/device/udev_linux/udev0_loader.cc
index 027f1c82c48..71b25ad1a51 100644
--- a/chromium/device/udev_linux/udev0_loader.cc
+++ b/chromium/device/udev_linux/udev0_loader.cc
@@ -27,6 +27,10 @@ const char* Udev0Loader::udev_device_get_devnode(udev_device* udev_device) {
   return lib_loader_->udev_device_get_devnode(udev_device);
 }
 
+const char* Udev0Loader::udev_device_get_devtype(udev_device* udev_device) {
+  return lib_loader_->udev_device_get_devtype(udev_device);
+}
+
 udev_device* Udev0Loader::udev_device_get_parent(udev_device* udev_device) {
   return lib_loader_->udev_device_get_parent(udev_device);
 }
diff --git a/chromium/device/udev_linux/udev0_loader.h b/chromium/device/udev_linux/udev0_loader.h
index 5dc39becf97..4126092fd77 100644
--- a/chromium/device/udev_linux/udev0_loader.h
+++ b/chromium/device/udev_linux/udev0_loader.h
@@ -23,6 +23,7 @@ class Udev0Loader : public UdevLoader {
   bool Init() override;
   const char* udev_device_get_action(udev_device* udev_device) override;
   const char* udev_device_get_devnode(udev_device* udev_device) override;
+  const char* udev_device_get_devtype(udev_device* udev_device) override;
   udev_device* udev_device_get_parent(udev_device* udev_device) override;
   udev_device* udev_device_get_parent_with_subsystem_devtype(
       udev_device* udev_device,
diff --git a/chromium/device/udev_linux/udev1_loader.cc b/chromium/device/udev_linux/udev1_loader.cc
index 8ff92ddb089..ef79b96cd8c 100644
--- a/chromium/device/udev_linux/udev1_loader.cc
+++ b/chromium/device/udev_linux/udev1_loader.cc
@@ -27,6 +27,10 @@ const char* Udev1Loader::udev_device_get_devnode(udev_device* udev_device) {
   return lib_loader_->udev_device_get_devnode(udev_device);
 }
 
+const char* Udev1Loader::udev_device_get_devtype(udev_device* udev_device) {
+  return lib_loader_->udev_device_get_devtype(udev_device);
+}
+
 udev_device* Udev1Loader::udev_device_get_parent(udev_device* udev_device) {
   return lib_loader_->udev_device_get_parent(udev_device);
 }
diff --git a/chromium/device/udev_linux/udev1_loader.h b/chromium/device/udev_linux/udev1_loader.h
index 0d8d6616a8c..c082075d608 100644
--- a/chromium/device/udev_linux/udev1_loader.h
+++ b/chromium/device/udev_linux/udev1_loader.h
@@ -23,6 +23,7 @@ class Udev1Loader : public UdevLoader {
   bool Init() override;
   const char* udev_device_get_action(udev_device* udev_device) override;
   const char* udev_device_get_devnode(udev_device* udev_device) override;
+  const char* udev_device_get_devtype(udev_device* udev_device) override;
   udev_device* udev_device_get_parent(udev_device* udev_device) override;
   udev_device* udev_device_get_parent_with_subsystem_devtype(
       udev_device* udev_device,
diff --git a/chromium/device/udev_linux/udev_loader.h b/chromium/device/udev_linux/udev_loader.h
index 4cece61b828..684e3e2da25 100644
--- a/chromium/device/udev_linux/udev_loader.h
+++ b/chromium/device/udev_linux/udev_loader.h
@@ -45,6 +45,7 @@ class UdevLoader {
 
   virtual const char* udev_device_get_action(udev_device* udev_device) = 0;
   virtual const char* udev_device_get_devnode(udev_device* udev_device) = 0;
+  virtual const char* udev_device_get_devtype(udev_device* udev_device) = 0;
   virtual udev_device* udev_device_get_parent(udev_device* udev_device) = 0;
   virtual udev_device* udev_device_get_parent_with_subsystem_devtype(
       udev_device* udev_device,