Revert 140439 - Make OTP sign in on by default. It can be turned off in about:flags

chrome/browser/resources/sync_setup_overlay.js

Index: chrome/browser/resources/sync_setup_overlay.js
diff --git a/chrome/browser/resources/sync_setup_overlay.js b/chrome/browser/resources/sync_setup_overlay.js
index edfff4ea7095c280acf918ad8b9a33c6861e6b10..49b64cbec12893d0e4d47fac9464fe38f7b6802c 100644
--- a/chrome/browser/resources/sync_setup_overlay.js
+++ b/chrome/browser/resources/sync_setup_overlay.js
@@ -675,9 +675,10 @@ cr.define('options', function() {
           function(elt) { elt.value = ''; });
       forEach(page.getElementsByClassName('reset-opaque'),
           function(elt) { elt.classList.remove('transparent'); });
-    },
-
-    showGaiaLogin_: function(args) {
+    },
+
+    showGaiaLogin_: function(args) {
+      var oldAccessCodeValue = $('access-code').value;
       this.resetPage_('sync-setup-login');
       $('sync-setup-login').hidden = false;
       this.allowEmptyPassword_ = false;
@@ -706,8 +707,7 @@ cr.define('options', function() {
       }
 
       if (1 == args.error) {
-        var accessCode = $('access-code');
-        if (accessCode.value) {
+        if (oldAccessCodeValue) {
           $('errormsg-0-access-code').hidden = false;
           this.showAccessCodeRequired_();
         } else {
@@ -725,6 +725,8 @@ cr.define('options', function() {
         if (args.askForOtp) {
           this.showOtpRequired_();
         } else {
+          if (oldAccessCodeValue)
+            $('errormsg-0-access-code').hidden = false;
           this.showAccessCodeRequired_();
         }
       } else if (args.errorMessage) {
@@ -795,8 +797,8 @@ cr.define('options', function() {
         return false;
       }
 
-      if (!f.accessCode.disabled && !f.accessCode.value) {
-        $('errormsg-0-password').hidden = false;
+      if (!f.accessCode.disabled && !f.accessCode.value) {
+        $('errormsg-0-access-code').hidden = false;
         return false;
       }