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

chrome/browser/resources/sync_setup_overlay.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   // Variable to track if a captcha challenge was issued. If this gets set to
   // true, it stays that way until we are told about successful login from
   // the browser.  This means subsequent errors (like invalid password) are
@@ skipping 660 matching lines @@
           function(elt) { elt.disabled = true; });
       forEach(page.getElementsByClassName('reset-enabled'),
           function(elt) { elt.disabled = false; });
       forEach(page.getElementsByClassName('reset-value'),
           function(elt) { elt.value = ''; });
       forEach(page.getElementsByClassName('reset-opaque'),
           function(elt) { elt.classList.remove('transparent'); });
     },
 
     showGaiaLogin_: function(args) {
+      var oldAccessCodeValue = $('access-code').value;
       this.resetPage_('sync-setup-login');
       $('sync-setup-login').hidden = false;
       this.allowEmptyPassword_ = false;
       this.captchaChallengeActive_ = false;
 
       var f = $('gaia-login-form');
       var email = $('gaia-email');
       var passwd = $('gaia-passwd');
       if (f) {
         if (args.user != undefined) {
           if (email.value != args.user)
             passwd.value = ''; // Reset the password field
           email.value = args.user;
         }
 
         if (!args.editableUser) {
           $('email-row').hidden = true;
           var span = $('email-readonly');
           span.textContent = email.value;
           $('email-readonly-row').hidden = false;
           $('create-account-div').hidden = true;
         }
 
         f.accessCode.disabled = true;
         f.otp.disabled = true;
       }
 
       if (1 == args.error) {
-        var accessCode = $('access-code');
-        if (accessCode.value) {
+        if (oldAccessCodeValue) {
           $('errormsg-0-access-code').hidden = false;
           this.showAccessCodeRequired_();
         } else {
           $('errormsg-1-password').hidden = (args.errorMessage != undefined);
         }
         this.setBlurbError_(args.errorMessage);
       } else if (3 == args.error) {
         $('errormsg-0-connection').hidden = false;
         this.setBlurbError_(args.errorMessage);
       } else if (4 == args.error) {
         this.showCaptcha_(args);
       } else if (7 == args.error) {
         this.setBlurbError_(loadTimeData.getString('serviceUnavailableError'));
       } else if (8 == args.error) {
         if (args.askForOtp) {
           this.showOtpRequired_();
         } else {
+          if (oldAccessCodeValue)
+            $('errormsg-0-access-code').hidden = false;
           this.showAccessCodeRequired_();
         }
       } else if (args.errorMessage) {
         this.setBlurbError_(args.errorMessage);
       }
 
       if (args.fatalError) {
         $('errormsg-fatal').hidden = false;
         $('sign-in').disabled = true;
         return;
@@ skipping 51 matching lines @@
       }
       // Don't enforce password being non-blank when checking access code (it
       // will have been cleared when the page was displayed).
       if (!this.allowEmptyPassword_ && !passwd.value) {
         $('errormsg-0-password').hidden = false;
         this.setBlurbError_();
         return false;
       }
 
       if (!f.accessCode.disabled && !f.accessCode.value) {
-        $('errormsg-0-password').hidden = false;
+        $('errormsg-0-access-code').hidden = false;
         return false;
       }
 
       if (f.accessCode.disabled && this.matchesASPRegex_(passwd.value) &&
           $('asp-warning-div').hidden) {
         $('asp-warning-div').hidden = false;
         $('gaia-passwd').value = '';
         return false;
       }
 
@@ skipping 147 matching lines @@
 
   SyncSetupOverlay.showStopSyncingUI = function() {
     SyncSetupOverlay.getInstance().showStopSyncingUI_();
   };
 
   // Export
   return {
     SyncSetupOverlay: SyncSetupOverlay
   };
 });