| Index: chrome/browser/chrome_browser_main.cc
|
| diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
|
| index 656009f0e166b2a96da3aeecb5996ae93ddebd0c..753404c9f37a64175e0219958b9f5cb717a861b0 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -718,6 +718,11 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {
|
| metrics->AddSyntheticTrialObserver(provider);
|
| }
|
|
|
| + // Associate parameters chosen in about:flags and create trial/group for them.
|
| + flags_ui::PrefServiceFlagsStorage flags_storage(
|
| + g_browser_process->local_state());
|
| + about_flags::RegisterAllFeatureVariationParameters(&flags_storage);
|
| +
|
| std::unique_ptr<base::FeatureList> feature_list(new base::FeatureList);
|
| feature_list->InitializeFromCommandLine(
|
| command_line->GetSwitchValueASCII(switches::kEnableFeatures),
|
| @@ -970,9 +975,9 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
|
| {
|
| TRACE_EVENT0("startup",
|
| "ChromeBrowserMainParts::PreCreateThreadsImpl:ConvertFlags");
|
| - flags_ui::PrefServiceFlagsStorage flags_storage_(
|
| + flags_ui::PrefServiceFlagsStorage flags_storage(
|
| g_browser_process->local_state());
|
| - about_flags::ConvertFlagsToSwitches(&flags_storage_,
|
| + about_flags::ConvertFlagsToSwitches(&flags_storage,
|
| base::CommandLine::ForCurrentProcess(),
|
| flags_ui::kAddSentinels);
|
| }
|
|
|