2019-08-29 06:50:14 +00: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
|
|
|
|
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
|
2020-07-22 05:34:34 +00:00
|
|
|
index e4d92e5fe7c8a0adaa9852631554878b9c7aa541..4c5e55396ee2115c67d711613f65b7e116ec1023 100644
|
2019-08-29 06:50:14 +00:00
|
|
|
--- a/services/network/network_context.cc
|
|
|
|
+++ b/services/network/network_context.cc
|
2020-07-22 05:34:34 +00:00
|
|
|
@@ -1082,6 +1082,13 @@ void NetworkContext::SetNetworkConditions(
|
2019-08-29 06:50:14 +00:00
|
|
|
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
|
2020-07-22 05:34:34 +00:00
|
|
|
index 4a06b262f880e6f15516e62960191dc1cdc829b9..37d4085272f39f451ca7a4b58c27b25771432c88 100644
|
2019-08-29 06:50:14 +00:00
|
|
|
--- a/services/network/network_context.h
|
|
|
|
+++ b/services/network/network_context.h
|
2020-07-22 05:34:34 +00:00
|
|
|
@@ -243,6 +243,7 @@ class COMPONENT_EXPORT(NETWORK_SERVICE) NetworkContext
|
2019-08-29 06:50:14 +00: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;
|
|
|
|
#if defined(OS_CHROMEOS)
|
|
|
|
diff --git a/services/network/public/mojom/network_context.mojom b/services/network/public/mojom/network_context.mojom
|
2020-07-22 05:34:34 +00:00
|
|
|
index 64b71f2bce79b52c81717e8f5ce87d7b7aa86242..41f5c3db2171cbe015dcb8c6a4436b94c377fec8 100644
|
2019-08-29 06:50:14 +00:00
|
|
|
--- a/services/network/public/mojom/network_context.mojom
|
|
|
|
+++ b/services/network/public/mojom/network_context.mojom
|
2020-07-14 01:13:34 +00:00
|
|
|
@@ -1050,6 +1050,9 @@ interface NetworkContext {
|
2019-08-29 06:50:14 +00:00
|
|
|
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
|
2020-07-22 05:34:34 +00:00
|
|
|
index 0dfed1a77748e3a3efe3fdeb46996f7ca21bec33..f103c782922396a842bccae9dd3ca9f37f4da66e 100644
|
2019-08-29 06:50:14 +00:00
|
|
|
--- a/services/network/test/test_network_context.h
|
|
|
|
+++ b/services/network/test/test_network_context.h
|
2020-05-26 20:06:26 +00:00
|
|
|
@@ -105,6 +105,7 @@ class TestNetworkContext : public mojom::NetworkContext {
|
2019-08-29 06:50:14 +00: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 {}
|
|
|
|
#if defined(OS_CHROMEOS)
|