Import Cronet version 121.0.6103.2

FolderOrigin-RevId: /tmp/copybara-origin/src
Change-Id: I690becfaba7ad4293eba08b4f9d1aa7f953fce20

5 files changed, 26 insertions, 12 deletions

diff --git a/url/mojom/BUILD.gn b/url/mojom/BUILD.gn
index a936a432b..7a35b09f4 100644
--- a/url/mojom/BUILD.gn
+++ b/url/mojom/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/config/chromeos/ui_mode.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 mojom("url_mojom_gurl") {
@@ -42,6 +43,13 @@ mojom("url_mojom_gurl") {
   ]
 
   webui_module_path = "chrome://resources/mojo/url/mojom"
+
+  # Used by Closure compiler targets in ash/webui/help_app_ui/, so this needs
+  # to generate WebUI bindings in JavaScript on Ash.
+  use_typescript_sources = !is_chromeos_ash
+
+  # Legacy JS bindings are needed for Blink regardless of platform.
+  generate_legacy_js_bindings = true
 }
 
 mojom("url_mojom_origin") {
@@ -86,6 +94,8 @@ mojom("url_mojom_origin") {
   ]
 
   webui_module_path = "chrome://resources/mojo/url/mojom"
+  use_typescript_sources = true
+  generate_legacy_js_bindings = true
 }
 
 mojom("url_mojom_scheme_host_port") {
@@ -138,4 +148,6 @@ component("mojom_traits") {
     "//mojo/public/cpp/base:shared_typemap_traits",
     "//url",
   ]
+
+  configs += [ "//build/config/compiler:wexit_time_destructors" ]
 }
diff --git a/url/mojom/origin_mojom_traits.cc b/url/mojom/origin_mojom_traits.cc
index 9e8475ac5..5b728b46b 100644
--- a/url/mojom/origin_mojom_traits.cc
+++ b/url/mojom/origin_mojom_traits.cc
@@ -4,7 +4,7 @@
 
 #include "url/mojom/origin_mojom_traits.h"
 
-#include "base/strings/string_piece.h"
+#include <string_view>
 
 namespace mojo {
 
@@ -12,7 +12,7 @@ namespace mojo {
 bool StructTraits<url::mojom::OriginDataView, url::Origin>::Read(
     url::mojom::OriginDataView data,
     url::Origin* out) {
-  base::StringPiece scheme, host;
+  std::string_view scheme, host;
   absl::optional<base::UnguessableToken> nonce_if_opaque;
   if (!data.ReadScheme(&scheme) || !data.ReadHost(&host) ||
       !data.ReadNonceIfOpaque(&nonce_if_opaque))
diff --git a/url/mojom/scheme_host_port_mojom_traits.cc b/url/mojom/scheme_host_port_mojom_traits.cc
index 63f6af4c1..01a50faf4 100644
--- a/url/mojom/scheme_host_port_mojom_traits.cc
+++ b/url/mojom/scheme_host_port_mojom_traits.cc
@@ -4,7 +4,8 @@
 
 #include "url/mojom/scheme_host_port_mojom_traits.h"
 
-#include "base/strings/string_piece.h"
+#include <string_view>
+
 #include "url/mojom/scheme_host_port.mojom-shared.h"
 #include "url/scheme_host_port.h"
 
@@ -13,7 +14,7 @@ namespace mojo {
 // static
 bool StructTraits<url::mojom::SchemeHostPortDataView, url::SchemeHostPort>::
     Read(url::mojom::SchemeHostPortDataView data, url::SchemeHostPort* out) {
-  base::StringPiece scheme, host;
+  std::string_view scheme, host;
   if (!data.ReadScheme(&scheme) || !data.ReadHost(&host))
     return false;
 
diff --git a/url/mojom/url_gurl_mojom_traits.cc b/url/mojom/url_gurl_mojom_traits.cc
index 97b301a0a..722d6ce92 100644
--- a/url/mojom/url_gurl_mojom_traits.cc
+++ b/url/mojom/url_gurl_mojom_traits.cc
@@ -9,23 +9,23 @@
 namespace mojo {
 
 // static
-base::StringPiece StructTraits<url::mojom::UrlDataView, GURL>::url(
+std::string_view StructTraits<url::mojom::UrlDataView, GURL>::url(
     const GURL& r) {
   if (r.possibly_invalid_spec().length() > url::kMaxURLChars || !r.is_valid()) {
-    return base::StringPiece();
+    return std::string_view();
   }
 
-  return base::StringPiece(r.possibly_invalid_spec().c_str(),
-                           r.possibly_invalid_spec().length());
+  return r.possibly_invalid_spec();
 }
 
 // static
 bool StructTraits<url::mojom::UrlDataView, GURL>::Read(
     url::mojom::UrlDataView data,
     GURL* out) {
-  base::StringPiece url_string;
-  if (!data.ReadUrl(&url_string))
+  std::string_view url_string;
+  if (!data.ReadUrl(&url_string)) {
     return false;
+  }
 
   if (url_string.length() > url::kMaxURLChars)
     return false;
diff --git a/url/mojom/url_gurl_mojom_traits.h b/url/mojom/url_gurl_mojom_traits.h
index 19ac049c8..ae29cc3f7 100644
--- a/url/mojom/url_gurl_mojom_traits.h
+++ b/url/mojom/url_gurl_mojom_traits.h
@@ -5,8 +5,9 @@
 #ifndef URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 #define URL_MOJOM_URL_GURL_MOJOM_TRAITS_H_
 
+#include <string_view>
+
 #include "base/component_export.h"
-#include "base/strings/string_piece.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "url/gurl.h"
 #include "url/mojom/url.mojom-shared.h"
@@ -16,7 +17,7 @@ namespace mojo {
 template <>
 struct COMPONENT_EXPORT(URL_MOJOM_TRAITS)
     StructTraits<url::mojom::UrlDataView, GURL> {
-  static base::StringPiece url(const GURL& r);
+  static std::string_view url(const GURL& r);
   static bool Read(url::mojom::UrlDataView data, GURL* out);
 };