| Index: base/metrics/field_trial.cc
|
| diff --git a/base/metrics/field_trial.cc b/base/metrics/field_trial.cc
|
| index 2ad7517a4bd59e22d0247c8d03c169b014b25829..e9e3be245702561fc7fdf31e74dae74085c9fea3 100644
|
| --- a/base/metrics/field_trial.cc
|
| +++ b/base/metrics/field_trial.cc
|
| @@ -325,12 +325,11 @@ FieldTrial* FieldTrialList::FactoryGetFieldTrialWithRandomizationSeed(
|
| // group number, so that it does not conflict with the |AppendGroup()|
|
| // result for the chosen group.
|
| const int kNonConflictingGroupNumber = -2;
|
| - COMPILE_ASSERT(
|
| + static_assert(
|
| kNonConflictingGroupNumber != FieldTrial::kDefaultGroupNumber,
|
| - conflicting_default_group_number);
|
| - COMPILE_ASSERT(
|
| - kNonConflictingGroupNumber != FieldTrial::kNotFinalized,
|
| - conflicting_default_group_number);
|
| + "The 'non-conflicting' group number conflicts");
|
| + static_assert(kNonConflictingGroupNumber != FieldTrial::kNotFinalized,
|
| + "The 'non-conflicting' group number conflicts");
|
| *default_group_number = kNonConflictingGroupNumber;
|
| }
|
| }
|
|
|