    }
  
    // Enable image load policies.
+diff --git a/third_party/blink/renderer/core/frame/local_frame.cc b/third_party/blink/renderer/core/frame/local_frame.cc
+index 4ceaa30497d2..c3557524c86d 100644
+--- a/third_party/blink/renderer/core/frame/local_frame.cc
++++ b/third_party/blink/renderer/core/frame/local_frame.cc
+@@ -38,6 +38,7 @@
+ #include "base/unguessable_token.h"
+ #include "mojo/public/cpp/bindings/self_owned_receiver.h"
+ #include "mojo/public/cpp/system/message_pipe.h"
++#include "net/net_buildflags.h"
+ #include "services/data_decoder/public/mojom/resource_snapshot_for_web_bundle.mojom-blink.h"
+ #include "services/network/public/cpp/features.h"
+ #include "services/network/public/mojom/content_security_policy.mojom-blink.h"
+@@ -551,7 +552,9 @@ void LocalFrame::Trace(Visitor* visitor) const {
+   visitor->Trace(raw_system_clipboard_);
+   visitor->Trace(virtual_keyboard_overlay_changed_observers_);
+   visitor->Trace(pause_handle_receivers_);
++#if BUILDFLAG(ENABLE_REPORTING)
+   visitor->Trace(reporting_service_);
++#endif
+ #if defined(OS_MAC)
+   visitor->Trace(text_input_host_);
+ #endif
+@@ -2273,6 +2276,7 @@ const base::UnguessableToken& LocalFrame::GetAgentClusterId() const {
+   return base::UnguessableToken::Null();
+ }
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+ mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
+   if (!reporting_service_.is_bound()) {
+     GetBrowserInterfaceBroker().GetInterface(
+@@ -2281,6 +2285,7 @@ mojom::blink::ReportingServiceProxy* LocalFrame::GetReportingService() {
+   }
+   return reporting_service_.get();
+ }
++#endif
+ 
+ // static
+ void LocalFrame::NotifyUserActivation(
+diff --git a/third_party/blink/renderer/core/frame/local_frame.h b/third_party/blink/renderer/core/frame/local_frame.h
+index 7635e2c40c4a..bd974710f869 100644
+--- a/third_party/blink/renderer/core/frame/local_frame.h
++++ b/third_party/blink/renderer/core/frame/local_frame.h
+@@ -38,6 +38,7 @@
+ #include "mojo/public/cpp/bindings/pending_associated_receiver.h"
+ #include "mojo/public/cpp/bindings/pending_receiver.h"
+ #include "mojo/public/cpp/bindings/unique_receiver_set.h"
++#include "net/net_buildflags.h"
+ #include "third_party/blink/public/common/frame/transient_allow_fullscreen.h"
+ #include "third_party/blink/public/mojom/blob/blob_url_store.mojom-blink.h"
+ #include "third_party/blink/public/mojom/frame/back_forward_cache_controller.mojom-blink.h"
+@@ -521,9 +522,9 @@ class CORE_EXPORT LocalFrame final
+   }
+ 
+   SmoothScrollSequencer& GetSmoothScrollSequencer();
+-
++#if BUILDFLAG(ENABLE_REPORTING)
+   mojom::blink::ReportingServiceProxy* GetReportingService();
+-
++#endif
+   // Returns the frame host ptr. The interface returned is backed by an
+   // associated interface with the legacy Chrome IPC channel.
+   mojom::blink::LocalFrameHost& GetLocalFrameHostRemote() const;
+@@ -903,9 +904,11 @@ class CORE_EXPORT LocalFrame final
+   // const methods.
+   //
+   // LocalFrame can be reused by multiple ExecutionContext.
++#if BUILDFLAG(ENABLE_REPORTING)
+   mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy,
+                          HeapMojoWrapperMode::kWithoutContextObserver>
+       reporting_service_{nullptr};
++#endif
+ 
+ #if defined(OS_MAC)
+   // LocalFrame can be reused by multiple ExecutionContext.
+diff --git a/third_party/blink/renderer/core/frame/reporting_context.cc b/third_party/blink/renderer/core/frame/reporting_context.cc
+index 83b93cc83e12..366bec41b98e 100644
+--- a/third_party/blink/renderer/core/frame/reporting_context.cc
++++ b/third_party/blink/renderer/core/frame/reporting_context.cc
+@@ -4,6 +4,7 @@
+ 
+ #include "third_party/blink/renderer/core/frame/reporting_context.h"
+ 
++#include "net/net_buildflags.h"
+ #include "third_party/blink/public/common/browser_interface_broker_proxy.h"
+ #include "third_party/blink/public/platform/platform.h"
+ #include "third_party/blink/public/platform/task_type.h"
+@@ -54,7 +55,9 @@ const char ReportingContext::kSupplementName[] = "ReportingContext";
+ ReportingContext::ReportingContext(ExecutionContext& context)
+     : Supplement<ExecutionContext>(context),
+       execution_context_(context),
++#if BUILDFLAG(ENABLE_REPORTING)
+       reporting_service_(&context),
++#endif
+       receiver_(this, &context) {}
+ 
+ // static
+@@ -118,7 +121,9 @@ void ReportingContext::Trace(Visitor* visitor) const {
+   visitor->Trace(observers_);
+   visitor->Trace(report_buffer_);
+   visitor->Trace(execution_context_);
++#if BUILDFLAG(ENABLE_REPORTING)
+   visitor->Trace(reporting_service_);
++#endif
+   visitor->Trace(receiver_);
+   Supplement<ExecutionContext>::Trace(visitor);
+ }
+@@ -140,6 +145,7 @@ void ReportingContext::CountReport(Report* report) {
+   UseCounter::Count(execution_context_, feature);
+ }
+ 
++#if BUILDFLAG(ENABLE_REPORTING)
+ const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+ ReportingContext::GetReportingService() const {
+   if (!reporting_service_.is_bound()) {
+@@ -149,6 +155,7 @@ ReportingContext::GetReportingService() const {
+   }
+   return reporting_service_;
+ }
++#endif
+ 
+ void ReportingContext::NotifyInternal(Report* report) {
+   // Buffer the report.
+@@ -171,6 +178,7 @@ void ReportingContext::NotifyInternal(Report* report) {
+ 
+ void ReportingContext::SendToReportingAPI(Report* report,
+                                           const String& endpoint) const {
++#if BUILDFLAG(ENABLE_REPORTING)
+   const String& type = report->type();
+   if (!(type == ReportType::kCSPViolation || type == ReportType::kDeprecation ||
+         type == ReportType::kFeaturePolicyViolation ||
+@@ -227,6 +235,7 @@ void ReportingContext::SendToReportingAPI(Report* report,
+         "Document policy violation", body->sourceFile(), line_number,
+         column_number);
+   }
++#endif
+ }
+ 
+ }  // namespace blink
+diff --git a/third_party/blink/renderer/core/frame/reporting_context.h b/third_party/blink/renderer/core/frame/reporting_context.h
+index 51bee8be0e3f..d575e88b9a36 100644
+--- a/third_party/blink/renderer/core/frame/reporting_context.h
++++ b/third_party/blink/renderer/core/frame/reporting_context.h
+@@ -5,6 +5,7 @@
+ #ifndef THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_REPORTING_CONTEXT_H_
+ 
++#include "net/net_buildflags.h"
+ #include "third_party/blink/public/mojom/frame/reporting_observer.mojom-blink.h"
+ #include "third_party/blink/public/mojom/reporting/reporting.mojom-blink.h"
+ #include "third_party/blink/renderer/core/core_export.h"
+@@ -53,10 +54,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+  private:
+   // Counts the use of a report type via UseCounter.
+   void CountReport(Report*);
+-
++#if BUILDFLAG(ENABLE_REPORTING)
+   const HeapMojoRemote<mojom::blink::ReportingServiceProxy>&
+   GetReportingService() const;
+-
++#endif
+   void NotifyInternal(Report* report);
+   // Send |report| via the Reporting API to |endpoint|.
+   void SendToReportingAPI(Report* report, const String& endpoint) const;
+@@ -67,8 +68,10 @@ class CORE_EXPORT ReportingContext : public GarbageCollected<ReportingContext>,
+ 
+   // This is declared mutable so that the service endpoint can be cached by
+   // const methods.
++#if BUILDFLAG(ENABLE_REPORTING)
+   mutable HeapMojoRemote<mojom::blink::ReportingServiceProxy>
+       reporting_service_;
++#endif
+ 
+   HeapMojoReceiver<mojom::blink::ReportingObserver, ReportingContext> receiver_;
+ };
 diff --git a/third_party/boringssl/BUILD.generated.gni b/third_party/boringssl/BUILD.generated.gni
 index 740267ac8c2e..34786c612501 100644
 --- a/third_party/boringssl/BUILD.generated.gni

 net/ssl/ssl_platform_key_util.h               |   7 ++
 sandbox/policy/mac/common.sb                  |  16 +++
 sandbox/win/src/process_mitigations.cc        |   4 +
 third_party/boringssl/BUILD.generated.gni     |   2 +
 32 files changed, 432 insertions(+), 16 deletions(-)

diff --git a/chrome/app/app-entitlements.plist b/chrome/app/app-entitlements.plist
index 522375410823..aae9bd8eba5d 100644

From 60986d25b0ac38ea527b5ef25a2419695c696093 Mon Sep 17 00:00:00 2001
From: Dmitrii Pichulin <deem@deem.ru>
Date: Fri, 5 Mar 2021 01:59:16 -0800
Subject: [PATCH] chromium GOSTSSL
