BASELINE: Update Chromium to 85.0.4183.14085-based

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

1 files changed, 24 insertions, 2 deletions

diff --git a/chromium/content/common/content_navigation_policy.h b/chromium/content/common/content_navigation_policy.h
index 3d9abb7db17..e7d1aaedd76 100644
--- a/chromium/content/common/content_navigation_policy.h
+++ b/chromium/content/common/content_navigation_policy.h
@@ -7,6 +7,7 @@
 
 #include "content/common/content_export.h"
 
+#include <array>
 #include <string>
 
 namespace content {
@@ -24,12 +25,33 @@ enum class ProactivelySwapBrowsingInstanceLevel {
   // Swap BrowsingInstance on cross-site navigations, but try to reuse the
   // current renderer process if possible.
   kCrossSiteReuseProcess = 2,
-  // TODO(rakina): Add another level for BrowsingInstance swap on same-site
-  // navigations with process reuse.
+  // Swap BrowsingInstance swap on same-site navigations, with process reuse.
+  kSameSite = 3,
+
+  kMaxValue = kSameSite,
 };
+
+// Levels of ProactivelySwapBrowsingInstance as strings (excluding kDisabled).
+CONTENT_EXPORT std::array<
+    std::string,
+    static_cast<size_t>(ProactivelySwapBrowsingInstanceLevel::kMaxValue)>
+ProactivelySwapBrowsingInstanceFeatureEnabledLevelValues();
+
+// Whether ProactivelySwapBrowsingInstance is enabled or not. Will return true
+// if the value is set to either of {kCrossSiteSwapProcess,
+// kCrossSiteReuseProcess, kSameSite}.
 CONTENT_EXPORT bool IsProactivelySwapBrowsingInstanceEnabled();
 
+// Whether ProactivelySwapBrowsingInstance with process reuse is enabled or not.
+// Will return true if the value is set to either of {kCrossSiteReuseProcess,
+// kSameSite}.
 CONTENT_EXPORT bool IsProactivelySwapBrowsingInstanceWithProcessReuseEnabled();
+
+// Whether ProactivelySwapBrowsingInstance for same-site navigation is enabled
+// or not. Will return true if the value is set to kSameSite.
+CONTENT_EXPORT bool
+IsProactivelySwapBrowsingInstanceOnSameSiteNavigationEnabled();
+
 CONTENT_EXPORT extern const char
     kProactivelySwapBrowsingInstanceLevelParameterName[];