|
@@ -6150,9 +6150,9 @@
|
|
|
};
|
|
|
|
|
|
} // namespace
|
|
|
-@@ -135,13 +126,6 @@ void SupervisedUserPrefStore::OnNewSetti
|
|
|
- prefs_->SetInteger(policy::policy_prefs::kForceYouTubeRestrict,
|
|
|
+@@ -137,13 +128,6 @@ void SupervisedUserPrefStore::OnNewSetti
|
|
|
safe_search_api::YOUTUBE_RESTRICT_MODERATE);
|
|
|
+ #endif
|
|
|
prefs_->SetBoolean(policy::policy_prefs::kHideWebStoreIcon, false);
|
|
|
-
|
|
|
-// TODO(b/290004926): Modifying `prefs::kSigninAllowed` causes check failures on
|
|
@@ -6202,7 +6202,7 @@
|
|
|
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS)
|
|
|
--- a/tools/metrics/histograms/enums.xml
|
|
|
+++ b/tools/metrics/histograms/enums.xml
|
|
|
-@@ -108207,7 +108207,6 @@ Full version information for the fingerp
|
|
|
+@@ -108216,7 +108216,6 @@ Full version information for the fingerp
|
|
|
<int value="3" label="kRestoreOnStartup"/>
|
|
|
<int value="4" label="kURLsToRestoreOnStartup"/>
|
|
|
<int value="5" label="extensions::pref_names::kExtensions"/>
|
|
@@ -6210,7 +6210,7 @@
|
|
|
<int value="7" label="kSearchProviderOverrides"/>
|
|
|
<int value="8" label="kDefaultSearchProviderSearchURL (Obsolete 12/2016)"/>
|
|
|
<int value="9" label="kDefaultSearchProviderKeyword (Obsolete 12/2016)"/>
|
|
|
-@@ -108222,10 +108221,7 @@ Full version information for the fingerp
|
|
|
+@@ -108231,10 +108230,7 @@ Full version information for the fingerp
|
|
|
<int value="18" label="kSafeBrowsingIncidentsSent"/>
|
|
|
<int value="19" label="kSwReporterPromptVersion (Obsolete 9/2023)"/>
|
|
|
<int value="20" label="kSwReporterPromptReason (Obsolete 9/2023)"/>
|