2019-08-28 23:50:14 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
|
|
|
Date: Wed, 28 Aug 2019 12:21:25 -0700
|
|
|
|
|
Subject: expose SetUserAgent on NetworkContext
|
|
|
|
|
|
|
|
|
|
Applying
|
|
|
|
|
https://chromium-review.googlesource.com/c/chromium/src/+/1585083 before
|
|
|
|
|
it's merged. There may end up being a better way of doing this, or the
|
|
|
|
|
patch may be merged upstream, at which point this patch should be
|
|
|
|
|
removed.
|
|
|
|
|
|
|
|
|
|
diff --git a/net/url_request/static_http_user_agent_settings.h b/net/url_request/static_http_user_agent_settings.h
|
2022-10-03 13:21:00 -07:00
|
|
|
index 0ab8187b0db8ae6db46d81738f653a2bc4c566f6..de3d55e85c22317f7f9375eb94d0d5d41b0dbd3b 100644
|
2019-08-28 23:50:14 -07:00
|
|
|
--- a/net/url_request/static_http_user_agent_settings.h
|
|
|
|
|
+++ b/net/url_request/static_http_user_agent_settings.h
|
2021-11-24 09:45:59 +01:00
|
|
|
@@ -30,13 +30,17 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings {
|
2019-08-28 23:50:14 -07:00
|
|
|
accept_language_ = new_accept_language;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+ void set_user_agent(const std::string& new_user_agent) {
|
|
|
|
|
+ user_agent_ = new_user_agent;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
// HttpUserAgentSettings implementation
|
|
|
|
|
std::string GetAcceptLanguage() const override;
|
|
|
|
|
std::string GetUserAgent() const override;
|
|
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
std::string accept_language_;
|
|
|
|
|
- const std::string user_agent_;
|
|
|
|
|
+ std::string user_agent_;
|
|
|
|
|
};
|
2021-10-21 11:51:36 -07:00
|
|
|
|
|
|
|
|
} // namespace net
|
2019-08-28 23:50:14 -07:00
|
|
|
diff --git a/services/network/network_context.cc b/services/network/network_context.cc
|
2025-09-24 11:56:54 -04:00
|
|
|
index 95822f635b61da7c63b5a1babf93bb61cb786293..892fa1d8d340906d359685894da6553377cda73b 100644
|
2019-08-28 23:50:14 -07:00
|
|
|
--- a/services/network/network_context.cc
|
|
|
|
|
+++ b/services/network/network_context.cc
|
2025-09-24 11:56:54 -04:00
|
|
|
@@ -1907,6 +1907,13 @@ void NetworkContext::EnableDurableMessageCollector(
|
2025-09-08 17:08:42 -04:00
|
|
|
it->second->AddReceiver(std::move(receiver));
|
2019-08-28 23:50:14 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+void NetworkContext::SetUserAgent(const std::string& new_user_agent) {
|
|
|
|
|
+ // This may only be called on NetworkContexts created with a constructor that
|
|
|
|
|
+ // calls ApplyContextParamsToBuilder.
|
|
|
|
|
+ DCHECK(user_agent_settings_);
|
|
|
|
|
+ user_agent_settings_->set_user_agent(new_user_agent);
|
|
|
|
|
+}
|
|
|
|
|
+
|
|
|
|
|
void NetworkContext::SetAcceptLanguage(const std::string& new_accept_language) {
|
|
|
|
|
// This may only be called on NetworkContexts created with the constructor
|
|
|
|
|
// that calls MakeURLRequestContext().
|
|
|
|
|
diff --git a/services/network/network_context.h b/services/network/network_context.h
|
2025-09-24 11:56:54 -04:00
|
|
|
index 56f1eec94a33c2c9a6289b12ac20323b4bef13d9..1b99211c9c96efba0713e953e708712d6c3714a6 100644
|
2019-08-28 23:50:14 -07:00
|
|
|
--- a/services/network/network_context.h
|
|
|
|
|
+++ b/services/network/network_context.h
|
2025-09-24 11:56:54 -04:00
|
|
|
@@ -335,6 +335,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
2025-09-08 17:08:42 -04:00
|
|
|
const base::UnguessableToken& throttling_profile_id,
|
|
|
|
|
mojo::PendingReceiver<network::mojom::DurableMessageCollector> receiver)
|
|
|
|
|
override;
|
2019-08-28 23:50:14 -07:00
|
|
|
+ void SetUserAgent(const std::string& new_user_agent) override;
|
|
|
|
|
void SetAcceptLanguage(const std::string& new_accept_language) override;
|
|
|
|
|
void SetEnableReferrers(bool enable_referrers) override;
|
2023-11-28 13:40:12 -08:00
|
|
|
#if BUILDFLAG(IS_CT_SUPPORTED)
|
2019-08-28 23:50:14 -07:00
|
|
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
2025-09-24 11:56:54 -04:00
|
|
|
index 840eff6ece73983a3b98673adbbb3cfd825565fe..5159d804c493bf2ae08d2786187c614efc96cf23 100644
|
2019-08-28 23:50:14 -07:00
|
|
|
--- a/services/network/public/mojom/network_context.mojom
|
|
|
|
|
+++ b/services/network/public/mojom/network_context.mojom
|
2025-09-24 11:56:54 -04:00
|
|
|
@@ -1337,6 +1337,9 @@ interface NetworkContext {
|
|
|
|
|
mojo_base.mojom.UnguessableToken throttling_profile_id,
|
|
|
|
|
pending_receiver<DurableMessageCollector> receiver);
|
2019-08-28 23:50:14 -07:00
|
|
|
|
|
|
|
|
+ // Updates the user agent to be used for requests.
|
|
|
|
|
+ SetUserAgent(string new_user_agent);
|
|
|
|
|
+
|
|
|
|
|
// Updates the Accept-Language header to be used for requests.
|
|
|
|
|
SetAcceptLanguage(string new_accept_language);
|
|
|
|
|
|
|
|
|
|
diff --git a/services/network/test/test_network_context.h b/services/network/test/test_network_context.h
|
2025-09-24 11:56:54 -04:00
|
|
|
index 6f0fe6423e8be903d4e38b783d31443c6ce89db5..9a5d7ad5d6e84e8b824c1614ee006c4984817929 100644
|
2019-08-28 23:50:14 -07:00
|
|
|
--- a/services/network/test/test_network_context.h
|
|
|
|
|
+++ b/services/network/test/test_network_context.h
|
2025-09-24 11:56:54 -04:00
|
|
|
@@ -161,6 +161,7 @@ class TestNetworkContext : public mojom::NetworkContext {
|
2019-08-28 23:50:14 -07:00
|
|
|
void CloseIdleConnections(CloseIdleConnectionsCallback callback) override {}
|
|
|
|
|
void SetNetworkConditions(const base::UnguessableToken& throttling_profile_id,
|
|
|
|
|
mojom::NetworkConditionsPtr conditions) override {}
|
|
|
|
|
+ void SetUserAgent(const std::string& new_user_agent) override {}
|
|
|
|
|
void SetAcceptLanguage(const std::string& new_accept_language) override {}
|
|
|
|
|
void SetEnableReferrers(bool enable_referrers) override {}
|
2023-11-28 13:40:12 -08:00
|
|
|
#if BUILDFLAG(IS_CT_SUPPORTED)
|