| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 53c56752cd93c1807246b1e15456595bd47e8cf4..c496ffe34032dc98f91d26d70326ab24f6248eb8 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -671,10 +671,8 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {
|
| // Initialize FieldTrialList to support FieldTrials that use one-time
|
| // randomization.
|
| metrics::MetricsService* metrics = browser_process_->metrics_service();
|
| - // TODO(asvitkine): Turn into a DCHECK after http://crbug.com/359406 is fixed.
|
| - CHECK(!field_trial_list_);
|
| - // TODO(asvitkine): Remove this after http://crbug.com/359406 is fixed.
|
| - base::FieldTrialList::EnableGlobalStateChecks();
|
| +
|
| + DCHECK(!field_trial_list_);
|
| field_trial_list_.reset(
|
| new base::FieldTrialList(metrics->CreateEntropyProvider().release()));
|
|
|
|
|