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 81acb80ef2a52b2133dcc59a1214723345095f61..634ef00866805f3953327f92f572e370ac56e015 100644 --- a/services/network/network_context.cc +++ b/services/network/network_context.cc @@ -1140,6 +1140,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 22e155061860f6782b261205f6297c09f8c6e1fa..656d1de560a1db7ff4973a9e087fcb7cd9e976e0 100644 --- a/services/network/network_context.h +++ b/services/network/network_context.h @@ -254,6 +254,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 BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom index 6f830a84d20e39b802b44465882f9ae0627a0759..b425a47d5a70267418fee69b55080ac05328a0b5 100644 --- a/services/network/public/mojom/network_context.mojom +++ b/services/network/public/mojom/network_context.mojom @@ -952,6 +952,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 a63f76756d4cb7e5cd60d6d7f2b2c5be5b45d3bf..13cff4ac5f699e78f3fb4fb6753b94e87f4d09e2 100644 --- a/services/network/test/test_network_context.h +++ b/services/network/test/test_network_context.h @@ -117,6 +117,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 BUILDFLAG(IS_CHROMEOS_ASH)