| Index: chrome/browser/browser_main.cc
|
| diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
|
| index 8d3bc3783d4162055e02479e5b6659708cbf636a..0e35e866d281f68ff6ed93a5dfe66404ce48aa15 100644
|
| --- a/chrome/browser/browser_main.cc
|
| +++ b/chrome/browser/browser_main.cc
|
| @@ -1384,6 +1384,10 @@ int BrowserMain(const MainFunctionParams& parameters) {
|
| if (!parsed_command_line.HasSwitch(switches::kNoErrorDialogs))
|
| WarnAboutMinimumSystemRequirements();
|
|
|
| + // Convert active labs into switches. Modifies the current command line.
|
| + about_flags::ConvertFlagsToSwitches(local_state,
|
| + CommandLine::ForCurrentProcess());
|
| +
|
| InitializeNetworkOptions(parsed_command_line);
|
|
|
| // Initialize histogram synchronizer system. This is a singleton and is used
|
| @@ -1398,10 +1402,6 @@ int BrowserMain(const MainFunctionParams& parameters) {
|
| // watched.
|
| scoped_ptr<ThreadWatcherList> thread_watcher_list(new ThreadWatcherList());
|
|
|
| - // Convert active labs into switches. Modifies the current command line.
|
| - about_flags::ConvertFlagsToSwitches(local_state,
|
| - CommandLine::ForCurrentProcess());
|
| -
|
| // Now the command line has been mutated based on about:flags, we can
|
| // set up metrics and initialize field trials.
|
| MetricsService* metrics = parts->SetupMetricsAndFieldTrials(
|
|
|