diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-21 05:12:11 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-21 05:12:11 +0000 |
| commit | 4ccb48be8436631418910305b797a7f054de00c9 (patch) | |
| tree | e36234b0e3198584cf551a5de07f6650012ac6e4 /chrome/browser/browser_main.cc | |
| parent | 08e3745c5aec4b966ff17a1f0b8c7d09c351ebf9 (diff) | |
| download | chromium_src-4ccb48be8436631418910305b797a7f054de00c9.zip chromium_src-4ccb48be8436631418910305b797a7f054de00c9.tar.gz chromium_src-4ccb48be8436631418910305b797a7f054de00c9.tar.bz2 | |
Convert active labs into switches earlier.
This change enables to check active labs in InitializeNetworkOptions().
BUG=42320
TEST=N/A
Review URL: http://codereview.chromium.org/6961015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86208 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index dd4463f..06ad5f5 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -1386,6 +1386,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 @@ -1400,10 +1404,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( |