Only perform forced re-enrollment in official builds.

Only perform forced re-enrollment in official builds.

There is no reason chromium builds should hit Google servers by
default. While at it, make the auto-enrollment mode decisions more explicit in the code.

BUG=chromium:358585
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261525

[Mattias Nissler (ping if slow), 2014-04-01 16:17:00]

Please review.

[Joao da Silva, 2014-04-02 07:41:44]

lgtm

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
(right):

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc:66: if
(command_line_mode.empty() ||
Why?

[Mattias Nissler (ping if slow), 2014-04-02 07:45:00]

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
(right):

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc:66: if
(command_line_mode.empty() ||
On 2014/04/02 07:41:45, Joao da Silva wrote:
> Why?

Because that's the original behavior of the flag and what is currently specified
in session_manager_setup.sh

[Joao da Silva, 2014-04-02 07:48:05]

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
(right):

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc:66: if
(command_line_mode.empty() ||
On 2014/04/02 07:45:00, Mattias Nissler wrote:
> On 2014/04/02 07:41:45, Joao da Silva wrote:
> > Why?
> 
> Because that's the original behavior of the flag and what is currently
specified
> in session_manager_setup.sh

Right, the flag could be used before without a value. Thanks!

[Mattias Nissler (ping if slow), 2014-04-02 13:10:39]

Joao, your instinct was right after all, the empty argument check was in the
wrong place.

Yuri, can you do an OWNERS review for the chromeos bits? Thanks!

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
File chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc
(right):

https://codereview.chromium.org/220933003/diff/1/chrome/browser/chromeos/logi...
chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.cc:66: if
(command_line_mode.empty() ||
On 2014/04/02 07:48:05, Joao da Silva wrote:
> On 2014/04/02 07:45:00, Mattias Nissler wrote:
> > On 2014/04/02 07:41:45, Joao da Silva wrote:
> > > Why?
> > 
> > Because that's the original behavior of the flag and what is currently
> specified
> > in session_manager_setup.sh
> 
> Right, the flag could be used before without a value. Thanks!

But in fact, it should only switch on FRE on official builds, so it was on the
wrong branch. Fixed now.

[ygorshenin1, 2014-04-02 14:07:33]

lgtm

[Mattias Nissler (ping if slow), 2014-04-02 14:42:27]

The CQ bit was checked by mnissler@chromium.org

[commit-bot: I haz the power, 2014-04-02 14:43:28]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/220933003/20001

[commit-bot: I haz the power, 2014-04-02 19:37:13]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-02 19:37:14]

Retried try job too often on android_aosp for step(s) compile
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=android_ao...

[Mattias Nissler (ping if slow), 2014-04-03 07:48:39]

The CQ bit was checked by mnissler@chromium.org

[commit-bot: I haz the power, 2014-04-03 07:50:32]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/220933003/20001

[commit-bot: I haz the power, 2014-04-03 11:33:44]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-03 11:33:44]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[Mattias Nissler (ping if slow), 2014-04-03 12:00:47]

The CQ bit was checked by mnissler@chromium.org

[commit-bot: I haz the power, 2014-04-03 12:00:50]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/220933003/20001

[commit-bot: I haz the power, 2014-04-03 13:30:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-03 13:30:38]

Retried try job too often on win_rel for step(s) net_unittests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=win_rel&nu...

[Mattias Nissler (ping if slow), 2014-04-03 13:45:45]

The CQ bit was checked by mnissler@chromium.org

[commit-bot: I haz the power, 2014-04-03 13:46:10]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/220933003/20001

[commit-bot: I haz the power, 2014-04-03 20:36:48]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-03 20:36:48]

Commit queue rejected this change because the description was changed
between the time the change entered the commit queue and the time it
was ready to commit. You can safely check the commit box again.

[Mattias Nissler (ping if slow), 2014-04-03 21:00:35]

The CQ bit was checked by mnissler@chromium.org

[commit-bot: I haz the power, 2014-04-03 21:02:06]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/mnissler@chromium.org/220933003/20001

[commit-bot: I haz the power, 2014-04-03 21:05:01]

Change committed as 261525