Re-enable OTP sign in on trunk

Re-enable OTP sign in on trunk by reverting most of 147297.

I am not simply reverting 147297 because that CL included some js code for correctly handling errors in the ASP case, and that is still useful should the user decide to go back to ASPs.

Change that disabled OTP on trunk:
https://chromiumcodereview.appspot.com/10800010
http:crrev.com/147297

BUG=137772
TEST=Signing in should ask for OTP instead of ASP.

Review URL: https://chromiumcodereview.appspot.com/10800010

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

[Roger Tawa OOO till Jul 10th, 2012-07-24 15:21:26]

Hi Tim,

Please take a look.  Thanks.

[tim (not reviewing), 2012-07-24 17:21:35]

lgtm

[commit-bot: I haz the power, 2012-07-24 18:39:42]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/10818006/12001

[commit-bot: I haz the power, 2012-07-24 18:39:48]

Presubmit check for 10818006-12001 failed and returned exit status 1.

Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    chrome/browser/ui/webui

Presubmit checks took 1.0s to calculate.

[Roger Tawa OOO till Jul 10th, 2012-07-24 19:54:41]

Hi James,

Can you do an owner review for the two webui files?  Thanks.

[James Hawkins, 2012-07-24 19:57:06]

lgtm

[commit-bot: I haz the power, 2012-07-24 20:03:23]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/10818006/12001

[commit-bot: I haz the power, 2012-07-24 21:19:09]

Change committed as 148201