Revert of Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker

chrome/browser/resources/chromeos/login/oobe_screen_oauth_enrollment.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.
 
 login.createScreen('OAuthEnrollmentScreen', 'oauth-enrollment', function() {
   /** @const */ var STEP_SIGNIN = 'signin';
   /** @const */ var STEP_WORKING = 'working';
   /** @const */ var STEP_ERROR = 'error';
   /** @const */ var STEP_EXPLAIN = 'explain';
   /** @const */ var STEP_SUCCESS = 'success';
 
   /** @const */ var HELP_TOPIC_ENROLLMENT = 4631259;
 
   return {
     EXTERNAL_API: [
       'showStep',
       'showError',
       'showWorking',
-      'setAuthenticatedUserEmail',
       'doReload',
     ],
 
     /**
      * URL to load in the sign in frame.
      */
     signInUrl_: null,
 
     /**
      * Dialog to confirm that auto-enrollment should really be cancelled.
@@ skipping 169 matching lines @@
 
     /**
      * Sets a progress message and switches to the working screen.
      * @param {string} message the progress message.
      */
     showWorking: function(message) {
       $('oauth-enroll-working-message').textContent = message;
       this.showStep(STEP_WORKING);
     },
 
-    /**
-     * Invoked when the authenticated user's e-mail address has been retrieved.
-     * This completes SAML authentication.
-     * @param {number} attemptToken An opaque token used to correlate this
-     *     method invocation with the corresponding request to retrieve the
-     *     user's e-mail address.
-     * @param {string} email The authenticated user's e-mail address.
-     */
-    setAuthenticatedUserEmail: function(attemptToken, email) {
-      if (this.attemptToken_ != attemptToken)
-        return;
-
-      if (!email)
-        this.showError(loadTimeData.getString('fatalEnrollmentError'), false);
-      else
-        chrome.send('oauthEnrollCompleteLogin', [email]);
-    },
-
     doReload: function() {
       $('oauth-enroll-signin-frame').contentWindow.location.href =
           this.signInUrl_;
     },
 
     /**
      * Handler for cancellations of an enforced auto-enrollment.
      */
     cancelAutoEnrollment: function() {
       // Only to be activated for the explain step in auto-enrollment.
@@ skipping 45 matching lines @@
      * Event handler for HTML5 messages.
      * @param {Object} m HTML5 message.
      */
     onMessage_: function(m) {
       if (!this.isSigninMessage_(m))
         return;
 
       var msg = m.data;
 
       if (msg.method == 'completeLogin') {
-        // A user has successfully authenticated via regular GAIA.
+        // A user has successfully authenticated via regular GAIA or SAML.
         chrome.send('oauthEnrollCompleteLogin', [msg.email]);
       }
 
-      if (msg.method == 'retrieveAuthenticatedUserEmail') {
-        // A user has successfully authenticated via SAML. However, the user's
-        // identity is not known. Instead of reporting success immediately,
-        // retrieve the user's e-mail address first.
-        this.attemptToken_ = msg.attemptToken;
-        this.showWorking(null);
-        chrome.send('oauthEnrollRetrieveAuthenticatedUserEmail',
-                    [msg.attemptToken]);
-      }
-
       if (msg.method == 'authPageLoaded' && this.currentStep_ == STEP_SIGNIN) {
         if (msg.isSAML) {
           $('oauth-saml-notice-message').textContent = loadTimeData.getStringF(
               'samlNotice',
               msg.domain);
         }
         this.classList.toggle('saml', msg.isSAML);
         chrome.send('frameLoadingCompleted', [0]);
       }
 
       if (msg.method == 'insecureContentBlocked') {
         this.showError(
             loadTimeData.getStringF('insecureURLEnrollmentError', msg.url),
             false);
       }
+
+      if (msg.method == 'missingGaiaInfo') {
+        this.showError(
+            loadTimeData.getString('fatalEnrollmentError'),
+            false);
+      }
     }
   };
 });