BASELINE: Update Chromium to 85.0.4183.14085-based

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

11 files changed, 14 insertions, 10 deletions

diff --git a/chromium/services/device/geolocation/BUILD.gn b/chromium/services/device/geolocation/BUILD.gn
index 45e6296d458..bc366b81794 100644
--- a/chromium/services/device/geolocation/BUILD.gn
+++ b/chromium/services/device/geolocation/BUILD.gn
@@ -70,8 +70,8 @@ source_set("geolocation") {
 
   deps = [
     "//base",
-    "//mojo/core/embedder",
     "//mojo/public/cpp/bindings",
+    "//mojo/public/cpp/system",
     "//net",
     "//ui/gfx",
   ]
diff --git a/chromium/services/device/geolocation/geolocation_context.cc b/chromium/services/device/geolocation/geolocation_context.cc
index 379b7651ea6..a41139ad815 100644
--- a/chromium/services/device/geolocation/geolocation_context.cc
+++ b/chromium/services/device/geolocation/geolocation_context.cc
@@ -24,7 +24,8 @@ void GeolocationContext::Create(
 }
 
 void GeolocationContext::BindGeolocation(
-    mojo::PendingReceiver<mojom::Geolocation> receiver) {
+    mojo::PendingReceiver<mojom::Geolocation> receiver,
+    const GURL& requesting_origin) {
   GeolocationImpl* impl = new GeolocationImpl(std::move(receiver), this);
   impls_.push_back(base::WrapUnique<GeolocationImpl>(impl));
   if (geoposition_override_)
diff --git a/chromium/services/device/geolocation/geolocation_context.h b/chromium/services/device/geolocation/geolocation_context.h
index d5863794b0f..b7c65a67a68 100644
--- a/chromium/services/device/geolocation/geolocation_context.h
+++ b/chromium/services/device/geolocation/geolocation_context.h
@@ -30,8 +30,8 @@ class GeolocationContext : public mojom::GeolocationContext {
   static void Create(mojo::PendingReceiver<mojom::GeolocationContext> receiver);
 
   // mojom::GeolocationContext implementation:
-  void BindGeolocation(
-      mojo::PendingReceiver<mojom::Geolocation> receiver) override;
+  void BindGeolocation(mojo::PendingReceiver<mojom::Geolocation> receiver,
+                       const GURL& requesting_origin) override;
   void SetOverride(mojom::GeopositionPtr geoposition) override;
   void ClearOverride() override;
 
diff --git a/chromium/services/device/geolocation/geolocation_service_unittest.cc b/chromium/services/device/geolocation/geolocation_service_unittest.cc
index 52ebfee8e3a..70547aab16b 100644
--- a/chromium/services/device/geolocation/geolocation_service_unittest.cc
+++ b/chromium/services/device/geolocation/geolocation_service_unittest.cc
@@ -54,7 +54,7 @@ class GeolocationServiceUnitTest : public DeviceServiceTestBase {
     device_service()->BindGeolocationContext(
         geolocation_context_.BindNewPipeAndPassReceiver());
     geolocation_context_->BindGeolocation(
-        geolocation_.BindNewPipeAndPassReceiver());
+        geolocation_.BindNewPipeAndPassReceiver(), GURL::EmptyGURL());
   }
 
   void TearDown() override {
diff --git a/chromium/services/device/geolocation/public_ip_address_geolocator_unittest.cc b/chromium/services/device/geolocation/public_ip_address_geolocator_unittest.cc
index 258ce53af1a..d6e7b4ddc15 100644
--- a/chromium/services/device/geolocation/public_ip_address_geolocator_unittest.cc
+++ b/chromium/services/device/geolocation/public_ip_address_geolocator_unittest.cc
@@ -9,9 +9,9 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/test/task_environment.h"
-#include "mojo/core/embedder/embedder.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/bindings/unique_receiver_set.h"
+#include "mojo/public/cpp/system/functions.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"
 #include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
 #include "services/network/test/test_network_connection_tracker.h"
@@ -42,7 +42,7 @@ class PublicIpAddressGeolocatorTest : public testing::Test {
  protected:
   void SetUp() override {
     // Intercept Mojo bad-message errors.
-    mojo::core::SetDefaultProcessErrorCallback(
+    mojo::SetDefaultProcessErrorHandler(
         base::BindRepeating(&PublicIpAddressGeolocatorTest::OnMojoBadMessage,
                             base::Unretained(this)));
 
@@ -57,8 +57,7 @@ class PublicIpAddressGeolocatorTest : public testing::Test {
 
   void TearDown() override {
     // Stop intercepting Mojo bad-message errors.
-    mojo::core::SetDefaultProcessErrorCallback(
-        mojo::core::ProcessErrorCallback());
+    mojo::SetDefaultProcessErrorHandler(base::NullCallback());
   }
 
   // Deal with mojo bad message.
diff --git a/chromium/services/device/geolocation/wifi_data_provider_chromeos.cc b/chromium/services/device/geolocation/wifi_data_provider_chromeos.cc
index 6698a7f6588..37bc1d54eae 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_chromeos.cc
+++ b/chromium/services/device/geolocation/wifi_data_provider_chromeos.cc
@@ -9,6 +9,7 @@
 #include <stdint.h>
 
 #include "base/bind.h"
+#include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chromeos/network/geolocation_handler.h"
 #include "chromeos/network/network_handler.h"
diff --git a/chromium/services/device/geolocation/wifi_data_provider_common.h b/chromium/services/device/geolocation/wifi_data_provider_common.h
index 19a168eb4c6..2590e0a83ae 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_common.h
+++ b/chromium/services/device/geolocation/wifi_data_provider_common.h
@@ -10,7 +10,6 @@
 
 #include <memory>
 
-#include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
diff --git a/chromium/services/device/geolocation/wifi_data_provider_linux.cc b/chromium/services/device/geolocation/wifi_data_provider_linux.cc
index 549df44c578..ffb0cb08820 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_linux.cc
+++ b/chromium/services/device/geolocation/wifi_data_provider_linux.cc
@@ -16,6 +16,7 @@
 #include <utility>
 #include <vector>
 
+#include "base/logging.h"
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chromium/services/device/geolocation/wifi_data_provider_linux_unittest.cc b/chromium/services/device/geolocation/wifi_data_provider_linux_unittest.cc
index af08db71f86..0552077b043 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/chromium/services/device/geolocation/wifi_data_provider_linux_unittest.cc
@@ -8,6 +8,7 @@
 
 #include <memory>
 
+#include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
diff --git a/chromium/services/device/geolocation/wifi_data_provider_mac.mm b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
index 49cd5870f26..5764adf247c 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_mac.mm
+++ b/chromium/services/device/geolocation/wifi_data_provider_mac.mm
@@ -7,6 +7,7 @@
 #import <CoreWLAN/CoreWLAN.h>
 #import <Foundation/Foundation.h>
 
+#include "base/logging.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
diff --git a/chromium/services/device/geolocation/wifi_data_provider_win.cc b/chromium/services/device/geolocation/wifi_data_provider_win.cc
index 0dd3a5f8875..e383a590996 100644
--- a/chromium/services/device/geolocation/wifi_data_provider_win.cc
+++ b/chromium/services/device/geolocation/wifi_data_provider_win.cc
@@ -8,6 +8,7 @@
 #include <winioctl.h>
 #include <wlanapi.h>
 
+#include "base/logging.h"
 #include "base/memory/free_deleter.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"