|
@@ -17,7 +17,7 @@ headers, moving forward we should find a way in upstream to provide
|
|
|
access to these headers for loader clients created on the browser process.
|
|
|
|
|
|
diff --git a/services/network/public/cpp/resource_request.cc b/services/network/public/cpp/resource_request.cc
|
|
|
-index b60fd23a39eb423450b57275526ac4ba36058225..deafb4cd5a55853eb11a1371ca8331ee5f6050b2 100644
|
|
|
+index 7d97d0fd5481bead1f655f2f933a3ae89a729834..9b4c41209190086353b9a87833c07aabb47470bd 100644
|
|
|
--- a/services/network/public/cpp/resource_request.cc
|
|
|
+++ b/services/network/public/cpp/resource_request.cc
|
|
|
@@ -178,6 +178,7 @@ ResourceRequest::TrustedParams& ResourceRequest::TrustedParams::operator=(
|
|
@@ -37,7 +37,7 @@ index b60fd23a39eb423450b57275526ac4ba36058225..deafb4cd5a55853eb11a1371ca8331ee
|
|
|
allow_cookies_from_browser == other.allow_cookies_from_browser &&
|
|
|
include_request_cookies_with_response ==
|
|
|
diff --git a/services/network/public/cpp/resource_request.h b/services/network/public/cpp/resource_request.h
|
|
|
-index b87bb47d4d51f734ee3dc1e38158726795fcd19e..dd862ff8c43ecbc08467bf2b49ed5044d92ad3f3 100644
|
|
|
+index 538e2a52da142a442342383d223ea0d90b75be8f..19f0defab1d1ba3369423842e4eabbceee781091 100644
|
|
|
--- a/services/network/public/cpp/resource_request.h
|
|
|
+++ b/services/network/public/cpp/resource_request.h
|
|
|
@@ -77,6 +77,7 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE) ResourceRequest {
|
|
@@ -49,7 +49,7 @@ index b87bb47d4d51f734ee3dc1e38158726795fcd19e..dd862ff8c43ecbc08467bf2b49ed5044
|
|
|
mojo::PendingRemote<mojom::TrustTokenAccessObserver> trust_token_observer;
|
|
|
mojo::PendingRemote<mojom::URLLoaderNetworkServiceObserver>
|
|
|
diff --git a/services/network/public/cpp/url_request_mojom_traits.cc b/services/network/public/cpp/url_request_mojom_traits.cc
|
|
|
-index ae26e1cff7235ac77d4610f936cf83b01a9b429d..d45189ba3280cd6802240fc5cee25388f77bdb39 100644
|
|
|
+index 2021e4c8f05008dd57e67c14fc7e66bf49bd6e3e..2a5ed7fc54f9efd773ec6dded1b66bb9c9f26580 100644
|
|
|
--- a/services/network/public/cpp/url_request_mojom_traits.cc
|
|
|
+++ b/services/network/public/cpp/url_request_mojom_traits.cc
|
|
|
@@ -49,6 +49,7 @@ bool StructTraits<network::mojom::TrustedUrlRequestParamsDataView,
|
|
@@ -61,7 +61,7 @@ index ae26e1cff7235ac77d4610f936cf83b01a9b429d..d45189ba3280cd6802240fc5cee25388
|
|
|
mojo::PendingRemote<network::mojom::CookieAccessObserver>>();
|
|
|
out->trust_token_observer = data.TakeTrustTokenObserver<
|
|
|
diff --git a/services/network/public/cpp/url_request_mojom_traits.h b/services/network/public/cpp/url_request_mojom_traits.h
|
|
|
-index fc85f9def245d854d210b14f8190119fbd38404b..1392090ef9a1c8c0ef1a958ebeae75f24a11a6ea 100644
|
|
|
+index 30a38e3f82360417b682c516263f62181825c621..db8a479f483a041a6944465deb6f799a2a9bd93a 100644
|
|
|
--- a/services/network/public/cpp/url_request_mojom_traits.h
|
|
|
+++ b/services/network/public/cpp/url_request_mojom_traits.h
|
|
|
@@ -71,6 +71,10 @@ struct COMPONENT_EXPORT(NETWORK_CPP_BASE)
|
|
@@ -76,7 +76,7 @@ index fc85f9def245d854d210b14f8190119fbd38404b..1392090ef9a1c8c0ef1a958ebeae75f2
|
|
|
cookie_observer(
|
|
|
const network::ResourceRequest::TrustedParams& trusted_params) {
|
|
|
diff --git a/services/network/public/mojom/url_request.mojom b/services/network/public/mojom/url_request.mojom
|
|
|
-index 3802bd880c7daddf3e9f4107d54a19744f039412..b88323f538dce6f839f19e45499ca12a6cf31fe0 100644
|
|
|
+index 78fa9126457ee380b12e39e3bf35ea4c2ccaa36c..4f39fa5d3bd665e3343882d11f1ab5747c80610e 100644
|
|
|
--- a/services/network/public/mojom/url_request.mojom
|
|
|
+++ b/services/network/public/mojom/url_request.mojom
|
|
|
@@ -74,6 +74,9 @@ struct TrustedUrlRequestParams {
|
|
@@ -112,7 +112,7 @@ index 1e5b36d0a46d9c66b7a56a6668663dd8196bd172..3431f4c3959264b64ac0f35654719ab0
|
|
|
string mime_type;
|
|
|
|
|
|
diff --git a/services/network/url_loader.cc b/services/network/url_loader.cc
|
|
|
-index 4408ef4ed23cd03ba1c57519272cedcff972e3a0..7feefe748e2dcbb81151e93e3434a8fcaf9b2ece 100644
|
|
|
+index 683380222b27618397eed667ec9d03fc6178ad6f..67b395898bdd019278b85d19f4d165daee8887b2 100644
|
|
|
--- a/services/network/url_loader.cc
|
|
|
+++ b/services/network/url_loader.cc
|
|
|
@@ -670,6 +670,9 @@ URLLoader::URLLoader(
|
|
@@ -155,7 +155,7 @@ index 4408ef4ed23cd03ba1c57519272cedcff972e3a0..7feefe748e2dcbb81151e93e3434a8fc
|
|
|
|
|
|
// Parse and remove the Trust Tokens response headers, if any are expected,
|
|
|
diff --git a/services/network/url_loader.h b/services/network/url_loader.h
|
|
|
-index c2b3041f19728ba10fb839a4db2d32b60a094400..8e215232d43d0506b3ea20fb1ef20660d47f6894 100644
|
|
|
+index 083bceb8e280a2aabf7f6075708f610fd1976e91..4034ef95297c04b558b5589059bbb305b438b13a 100644
|
|
|
--- a/services/network/url_loader.h
|
|
|
+++ b/services/network/url_loader.h
|
|
|
@@ -760,6 +760,8 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) URLLoader
|