Fix conflicts

From db2aa61752096587e19104ef25daa03245e68747 Mon Sep 17 00:00:00 2001

From fb06d95b44111873fa67ebe71c8889ff3aa801d1 Mon Sep 17 00:00:00 2001

From: Daniel Micay <danielmicay@gmail.com>

From: Daniel Micay <danielmicay@gmail.com>

Date: Tue, 25 Dec 2018 16:19:51 -0500

Date: Tue, 25 Dec 2018 16:19:51 -0500

Subject: disable seed-based field trials

Subject: disable seed-based field trials

 1 file changed, 2 insertions(+)

 1 file changed, 2 insertions(+)

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

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

index 5ca71d4b7aa19..c421d868fba44 100644

index 5cf5eb1cc9441..7e76dcdcedf19 100644

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

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

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

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

@@ -335,9 +335,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

@@ -318,9 +318,11 @@ bool VariationsFieldTrialCreatorBase::SetUpFieldTrials(

   bool used_seed = false;

   CreateTrialsResult create_trials_result = {.applied_seed = false};

   if (!used_testing_config && client_filterable_state) {

   if (!used_testing_config && client_filterable_state) {

+  #if defined(FIELDTRIAL_SEED_ENABLED)

+  #if defined(FIELDTRIAL_SEED_ENABLED)

     used_seed = CreateTrialsFromSeed(

     create_trials_result = CreateTrialsFromSeed(

         entropy_providers, feature_list.get(), safe_seed_manager,

         entropy_providers, feature_list.get(), safe_seed_manager,

         synthetic_trial_registry, std::move(client_filterable_state));

         std::move(client_filterable_state));

+  #endif

+  #endif

   }

   }

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

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

-- 

-- 

2.34.1

2.50.0