diff --git a/build/patches/Disable-fetching-of-all-field-trials.patch b/build/patches/Disable-fetching-of-all-field-trials.patch index 6440902f..5842ea7d 100644 --- a/build/patches/Disable-fetching-of-all-field-trials.patch +++ b/build/patches/Disable-fetching-of-all-field-trials.patch @@ -21,14 +21,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html components/variations/net/BUILD.gn | 2 -- .../variations/net/omnibox_http_headers.cc | 4 +-- .../variations/net/variations_http_headers.cc | 3 ++ - .../variations_field_trial_creator_base.cc | 8 ++--- + .../variations_field_trial_creator_base.cc | 6 ++-- .../variations/service/variations_service.cc | 15 ++------ .../browser/loader/url_loader_throttles.cc | 7 ---- .../origin_trials/origin_trials_utils.cc | 2 +- .../variations_render_thread_observer.cc | 9 ----- .../Disable-fetching-of-all-field-trials.inc | 1 + .../renderer/core/loader/document_loader.cc | 7 ---- - 21 files changed, 29 insertions(+), 89 deletions(-) + 21 files changed, 29 insertions(+), 87 deletions(-) create mode 100644 cromite_flags/content/public/common/content_features_cc/Disable-fetching-of-all-field-trials.inc diff --git a/android_webview/browser/component_updater/origin_trials_component_loader.cc b/android_webview/browser/component_updater/origin_trials_component_loader.cc @@ -280,19 +280,17 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c // Determines whether the field trial testing config defined in // testing/variations/fieldtrial_testing_config.json should be applied. If the // "disable_fieldtrial_testing_config" GN flag is set to true, then the testing -@@ -330,11 +331,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( +@@ -330,9 +331,6 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials( safe_seed_manager, synthetic_trial_registry); } - platform_field_trials->SetUpClientSideFieldTrials( - used_seed, *entropy_providers, feature_list.get()); - -- platform_field_trials->RegisterFeatureOverrides(feature_list.get()); -- - base::FeatureList::SetInstance(std::move(feature_list)); + platform_field_trials->RegisterFeatureOverrides(feature_list.get()); - // For testing Variations Safe Mode, maybe crash here. -@@ -629,6 +625,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( + base::FeatureList::SetInstance(std::move(feature_list)); +@@ -629,6 +627,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( base::FeatureList* feature_list, SafeSeedManagerBase* safe_seed_manager, SyntheticTrialRegistry* synthetic_trial_registry) { @@ -300,7 +298,7 @@ diff --git a/components/variations/service/variations_field_trial_creator_base.c // This histogram name uses "VariationsFieldTrialCreator" rather than // "VariationsFieldTrialCreatorBase" for consistency with historical data TRACE_EVENT0("startup", "VariationsFieldTrialCreator::CreateTrialsFromSeed"); -@@ -744,6 +741,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( +@@ -744,6 +743,7 @@ bool VariationsFieldTrialCreatorBase::CreateTrialsFromSeed( void VariationsFieldTrialCreatorBase::LoadSeedFromJsonFile( const base::FilePath& json_seed_path) {