From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp 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 index 0ccfe130f00ec3b6c75cd8ee04d5a2777e1fd00c..653829457d58bf92057cc36aa8a289703d8b0577 100644 --- a/net/url_request/static_http_user_agent_settings.h +++ b/net/url_request/static_http_user_agent_settings.h @@ -26,13 +26,17 @@ class NET_EXPORT StaticHttpUserAgentSettings : public HttpUserAgentSettings { 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_; DISALLOW_COPY_AND_ASSIGN(StaticHttpUserAgentSettings); }; diff --git a/services/network/network_context.cc b/services/network/network_context.cc index fa804e8f46ce96af4d9c1c2172220b0780729103..4e84b19cd515883f9dd1db4672ab1a3fccbf00f3 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -1044,6 +1044,13 @@ void NetworkContext::SetNetworkConditions( std::move(network_conditions)); } +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 index b70111eda2ed582e2b81e0364c6e5fade743515b..2682dc391d23cb9fe568c182ed55cc43412d9a1c 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h @@ -238,6 +238,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext 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; #if defined(OS_CHROMEOS) diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom index 485960c69443533461da4f95d2e73995f604702f..45e920425345dd3cdb2427df5f60f6d8cc81e07a 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -1021,6 +1021,9 @@ interface NetworkContext { SetNetworkConditions(mojo_base.mojom.UnguessableToken throttling_profile_id, NetworkConditions? conditions); + // 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 index 30463e8b23411ff7d2b0c8b2464959b2f3ae88c2..f86b16b57b5b032c4460357e8c2248e4cd632712 100644 --- a/services/network/test/test_network_context.h +++ b/services/network/test/test_network_context.h @@ -104,6 +104,7 @@ class TestNetworkContext : public mojom::NetworkContext { 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 {} #if defined(OS_CHROMEOS)