Check for channel and flag before allowing demo mode.

Check for channel and flag before allowing demo mode.

If we're running a test image or have the --disable-demo-mode flag specified
we should not be launching demo mode. The channel check doesn't exist for the
HID screen. This CL moves the check into the main demo mode detector so if it
is called from anywhere, the check is always performed.

R=xiyuan@chromium.org
BUG=398271
Committed: https://crrev.com/ac4db7aca56d6ea9cda598f7076690de8a90df79
Cr-Commit-Position: refs/heads/master@{#292529}

[xiyuan, 2014-08-28 19:25:51]

lgtm

https://codereview.chromium.org/514273003/diff/1/chrome/browser/ui/webui/chro...
File chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc (right):

https://codereview.chromium.org/514273003/diff/1/chrome/browser/ui/webui/chro...
chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc:40: if
(base::SysInfo::IsRunningOnChromeOS()) {
nit: insert an empty line before this line

[rkc, 2014-08-28 19:38:19]

https://codereview.chromium.org/514273003/diff/1/chrome/browser/ui/webui/chro...
File chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc (right):

https://codereview.chromium.org/514273003/diff/1/chrome/browser/ui/webui/chro...
chrome/browser/ui/webui/chromeos/login/demo_mode_detector.cc:40: if
(base::SysInfo::IsRunningOnChromeOS()) {
On 2014/08/28 19:25:51, xiyuan wrote:
> nit: insert an empty line before this line

Done.

[rkc, 2014-08-28 19:38:22]

The CQ bit was checked by rkc@chromium.org

[commit-bot: I haz the power, 2014-08-28 19:38:42]

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

[commit-bot: I haz the power, 2014-08-29 01:02:43]

Committed patchset #2 (id:20001) as 89d25932a2392e8933497743832c9afb2f0eaa6e

[commit-bot: I haz the power, 2014-09-10 03:04:36]

Patchset 2 (id:??) landed as
https://crrev.com/ac4db7aca56d6ea9cda598f7076690de8a90df79
Cr-Commit-Position: refs/heads/master@{#292529}