BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 15 insertions, 4 deletions

diff --git a/chromium/components/navigation_interception/android/BUILD.gn b/chromium/components/navigation_interception/android/BUILD.gn
index 7a53961c187..917d94892b0 100644
--- a/chromium/components/navigation_interception/android/BUILD.gn
+++ b/chromium/components/navigation_interception/android/BUILD.gn
@@ -5,7 +5,10 @@
 import("//build/config/android/rules.gni")
 
 android_library("navigation_interception_java") {
-  deps = [ "//base:base_java" ]
+  deps = [
+    "//base:base_java",
+    "//url:origin_java",
+  ]
   sources = [
     "java/src/org/chromium/components/navigation_interception/InterceptNavigationDelegate.java",
     "java/src/org/chromium/components/navigation_interception/NavigationParams.java",
diff --git a/chromium/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java b/chromium/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java
index 4403589d422..e02aa54caaf 100644
--- a/chromium/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java
+++ b/chromium/components/navigation_interception/android/java/src/org/chromium/components/navigation_interception/NavigationParams.java
@@ -6,7 +6,10 @@ package org.chromium.components.navigation_interception;
 
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import org.chromium.base.annotations.CalledByNative;
+import org.chromium.url.Origin;
 
 /**
  * Navigation parameters container used to keep parameters for navigation interception.
@@ -45,9 +48,13 @@ public class NavigationParams {
     /** True if navigation is renderer initiated. Eg clicking on a link. */
     public final boolean isRendererInitiated;
 
+    /** Initiator origin of the request, could be null. */
+    public final Origin initiatorOrigin;
+
     public NavigationParams(String url, String referrer, boolean isPost, boolean hasUserGesture,
             int pageTransitionType, boolean isRedirect, boolean isExternalProtocol,
-            boolean isMainFrame, boolean isRendererInitiated, boolean hasUserGestureCarryover) {
+            boolean isMainFrame, boolean isRendererInitiated, boolean hasUserGestureCarryover,
+            @Nullable Origin initiatorOrigin) {
         this.url = url;
         this.referrer = TextUtils.isEmpty(referrer) ? null : referrer;
         this.isPost = isPost;
@@ -58,15 +65,16 @@ public class NavigationParams {
         this.isMainFrame = isMainFrame;
         this.isRendererInitiated = isRendererInitiated;
         this.hasUserGestureCarryover = hasUserGestureCarryover;
+        this.initiatorOrigin = initiatorOrigin;
     }
 
     @CalledByNative
     public static NavigationParams create(String url, String referrer, boolean isPost,
             boolean hasUserGesture, int pageTransitionType, boolean isRedirect,
             boolean isExternalProtocol, boolean isMainFrame, boolean isRendererInitiated,
-            boolean hasUserGestureCarryover) {
+            boolean hasUserGestureCarryover, @Nullable Origin initiatorOrigin) {
         return new NavigationParams(url, referrer, isPost, hasUserGesture, pageTransitionType,
                 isRedirect, isExternalProtocol, isMainFrame, isRendererInitiated,
-                hasUserGestureCarryover);
+                hasUserGestureCarryover, initiatorOrigin);
     }
 }