Merge branch '1946-master-webview_crash' into 'master'

From f5ec28fc3656ce0b513d0d6e95281ff00d71c8cd Mon Sep 17 00:00:00 2001

From 4afd33e75cacaad69e297b9b36d0bbc25193f7d6 Mon Sep 17 00:00:00 2001

From: althafvly <althafvly@gmail.com>

Date: Wed, 20 Sep 2023 09:48:52 +0530

Subject: [PATCH 11/48] fixup Disable fetching of all field trials

---

 .../services/SafeModeVariationsSeedContentProvider.java   | 8 +-------

 build/android/gyp/proguard.py                             | 2 ++

 2 files changed, 3 insertions(+), 7 deletions(-)

 .../service/variations_field_trial_creator_base.cc        | 2 ++

 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/android_webview/nonembedded/java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java b/android_webview/nonembedded/java/src/org/chromium/android_webview/services/SafeModeVariationsSeedContentProvider.java

index 4a5bbb81a6812..c3fd6b3fbd68a 100644

     ]) + ')',

     # TODO(agrieve): Remove once we update to U SDK.

     r'OnBackAnimationCallback',

diff --git a/components/variations/service/variations_field_trial_creator_base.cc b/components/variations/service/variations_field_trial_creator_base.cc

index e5404d2ca1a3c..60fdab67fada8 100644

--- a/components/variations/service/variations_field_trial_creator_base.cc

+++ b/components/variations/service/variations_field_trial_creator_base.cc

@@ -301,6 +301,8 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

                                      safe_seed_manager);

   }

+  platform_field_trials->RegisterFeatureOverrides(feature_list.get());

+

   base::FeatureList::SetInstance(std::move(feature_list));

   // For testing Variations Safe Mode, maybe crash here.

-- 

2.34.1