Convert active labs into switches earlier.

Convert active labs into switches earlier.
This change enables to check active labs in InitializeNetworkOptions().

BUG=42320
TEST=N/A


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=86208

[Takashi Toyoshima, 2011-05-20 11:47:07]

Ben:
Could you review this change?

Brettw, Adam, Mike and Willchan:
Could anyone check that this change is harmless for InitializeNetworkOptions() ?

I'd like to add command line check at the bottom of InitializeNetworkOptions() .
It's only for command line now, but it will appear in about:flags in the future.
That's why I need this change.

cf.) http://codereview.chromium.org/7047003/ .

[Ben Goodger (Google), 2011-05-20 14:48:19]

I can give an approval once people more familiar to what this code does
chime in.

-Ben

On Fri, May 20, 2011 at 4:47 AM, <toyoshim@chromium.org> wrote:

> Reviewers: Ben Goodger, brettw, abarth, Mike Belshe, willchan,
>
> Message:
> Ben:
> Could you review this change?
>
> Brettw, Adam, Mike and Willchan:
> Could anyone check that this change is harmless for
> InitializeNetworkOptions() ?
>
> I'd like to add command line check at the bottom of
> InitializeNetworkOptions() .
> It's only for command line now, but it will appear in about:flags in the
> future.
> That's why I need this change.
>
> cf.) http://codereview.chromium.org/7047003/ .
>
>
> Description:
> Convert active labs into switches earlier.
> This change enables to check active labs in InitializeNetworkOptions().
>
> BUG=42320
> TEST=N/A
>
>
> Please review this at http://codereview.chromium.org/6961015/
>
> SVN Base: http://git.chromium.org/git/chromium.git@trunk
>
> Affected files:
>  M chrome/browser/browser_main.cc
>
>
> 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(
>
>
>

[abarth-chromium, 2011-05-20 16:25:50]

Probably evmar should review, right?

[willchan no longer on Chromium, 2011-05-20 21:31:18]

Yeah, let's send this to Evan.

FWIW, at a glance, I think it looks OK, but Evan should confirm.

[Evan Martin, 2011-05-20 21:33:53]

I think nico is the about:flags master

[Nico, 2011-05-20 21:37:43]

LGTM

what could go wrong

[commit-bot: I haz the power, 2011-05-21 03:08:49]

Try job failure for 6961015-1 on mac:
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=mac&number...

[commit-bot: I haz the power, 2011-05-21 05:12:14]

Change committed as 86208