 +    sources += [
 +      "net/cross_origin_embedder_policy_reporter.cc",
 +      "net/cross_origin_embedder_policy_reporter.h",
++      "net/cross_origin_opener_policy_reporter.cc",
++      "net/cross_origin_opener_policy_reporter.h",
 +    ]
 +  }
  
    if (use_viz_devtools) {
      sources += [
 diff --git a/content/browser/storage_partition_impl.cc b/content/browser/storage_partition_impl.cc
-index f06c5b512342..4cfc7ca3f71c 100644
+index a0034ad3a21d..dd14d7a3ca5c 100644
 --- a/content/browser/storage_partition_impl.cc
 +++ b/content/browser/storage_partition_impl.cc
-@@ -117,6 +117,10 @@
+@@ -120,6 +120,10 @@
  #include "content/browser/host_zoom_map_impl.h"
  #endif  // defined(OS_ANDROID)
  

   void NotifySSLConfigChanged(bool is_cert_database_change);
   void NotifySSLConfigForServerChanged(const HostPortPair& server);
diff --git a/net/socket/ssl_client_socket_impl.cc b/net/socket/ssl_client_socket_impl.cc
index 12fb37570a5e..cefb7dc13c91 100644
--- a/net/socket/ssl_client_socket_impl.cc
+++ b/net/socket/ssl_client_socket_impl.cc
@@ -453,6 +453,18 @@ int SSLClientSocketImpl::ExportKeyingMaterial(const base::StringPiece& label,

   // Set SSL to client mode. Handshake happens in the loop below.
   SSL_set_connect_state(ssl_.get());
 
@@ -1189,6 +1213,82 @@ ssl_verify_result_t SSLClientSocketImpl::VerifyCert() {
 
   start_cert_verification_time_ = base::TimeTicks::Now();
 
