84 lines
3.8 KiB
Diff
84 lines
3.8 KiB
Diff
From: csagan5 <32685696+csagan5@users.noreply.github.com>
|
|
Date: Mon, 10 Feb 2020 23:13:13 +0100
|
|
Subject: Guard for user-agent reduction
|
|
|
|
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
|
|
---
|
|
chrome/browser/chrome_content_browser_client.cc | 2 +-
|
|
content/common/user_agent.cc | 13 +++++--------
|
|
third_party/blink/common/features.cc | 4 ++--
|
|
.../platform/runtime_enabled_features.json5 | 3 ++-
|
|
4 files changed, 10 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
|
--- a/chrome/browser/chrome_content_browser_client.cc
|
|
+++ b/chrome/browser/chrome_content_browser_client.cc
|
|
@@ -1617,7 +1617,7 @@ void ChromeContentBrowserClient::RegisterProfilePrefs(
|
|
registry->RegisterIntegerPref(
|
|
prefs::kUserAgentReduction,
|
|
static_cast<int>(
|
|
- embedder_support::UserAgentReductionEnterprisePolicyState::kDefault));
|
|
+ embedder_support::UserAgentReductionEnterprisePolicyState::kForceEnabled));
|
|
registry->RegisterBooleanPref(prefs::kOriginAgentClusterDefaultEnabled, true);
|
|
registry->RegisterIntegerPref(
|
|
prefs::kForceMajorVersionToMinorPositionInUserAgent,
|
|
diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc
|
|
--- a/content/common/user_agent.cc
|
|
+++ b/content/common/user_agent.cc
|
|
@@ -347,14 +347,7 @@ std::string BuildUserAgentFromProduct(const std::string& product) {
|
|
}
|
|
|
|
std::string BuildModelInfo() {
|
|
- std::string model;
|
|
-#if BUILDFLAG(IS_ANDROID)
|
|
- // Only send the model information if on the release build of Android,
|
|
- // matching user agent behaviour.
|
|
- if (base::SysInfo::GetAndroidBuildCodename() == "REL")
|
|
- model = base::SysInfo::HardwareModelName();
|
|
-#endif
|
|
- return model;
|
|
+ return std::string();
|
|
}
|
|
|
|
#if BUILDFLAG(IS_ANDROID)
|
|
@@ -375,6 +368,10 @@ std::string GetAndroidOSInfo(
|
|
IncludeAndroidModel include_android_model) {
|
|
std::string android_info_str;
|
|
|
|
+ // Do not send information about the device.
|
|
+ include_android_model = IncludeAndroidModel::Exclude;
|
|
+ include_android_build_number = IncludeAndroidBuildNumber::Exclude;
|
|
+
|
|
// Send information about the device.
|
|
bool semicolon_inserted = false;
|
|
if (include_android_model == IncludeAndroidModel::Include) {
|
|
diff --git a/third_party/blink/common/features.cc b/third_party/blink/common/features.cc
|
|
--- a/third_party/blink/common/features.cc
|
|
+++ b/third_party/blink/common/features.cc
|
|
@@ -1285,8 +1285,8 @@ BASE_FEATURE(kDurableClientHintsCache,
|
|
const base::FeatureParam<std::string> kUserAgentFrozenBuildVersion{
|
|
&kReduceUserAgentMinorVersion, "build_version", "0"};
|
|
|
|
-const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = {
|
|
- &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true};
|
|
+const base::FeatureParam<bool> kAllExceptLegacyWindowsPlatform = { // must be enabled
|
|
+ &kReduceUserAgentPlatformOsCpu, "all_except_legacy_windows_platform", true}; // in Bromite
|
|
const base::FeatureParam<bool> kLegacyWindowsPlatform = {
|
|
&kReduceUserAgentPlatformOsCpu, "legacy_windows_platform", true};
|
|
|
|
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
|
@@ -3384,7 +3384,8 @@
|
|
status: "stable",
|
|
},
|
|
{
|
|
- name: "UserAgentReduction",
|
|
+ name: "UserAgentReduction", // always enabled
|
|
+ status: "stable", // in bromite
|
|
origin_trial_feature_name: "UserAgentReduction",
|
|
origin_trial_allows_third_party: true,
|
|
// iOS not included as it should not send a reduced User-Agent string.
|
|
--
|
|
2.25.1
|