Pass Device ID in the oauth2/token request. Keep Device ID in local state on Chrome OS.

chrome/browser/resources/chromeos/login/screen_gaia_signin.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.
 
 /**
  * @fileoverview Oobe signin screen implementation.
  */
 
 login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
   // Gaia loading time after which error message must be displayed and
@@ skipping 15 matching lines @@
 
   return {
     EXTERNAL_API: [
       'loadAuthExtension',
       'updateAuthExtension',
       'doReload',
       'onWebviewError',
       'onFrameError',
       'updateCancelButtonState',
       'showWhitelistCheckFailedError',
-      'updateDeviceId',
     ],
 
     /**
      * Frame loading error code (0 - no error).
      * @type {number}
      * @private
      */
     error_: 0,
 
     /**
@@ skipping 99 matching lines @@
       this.gaiaAuthHost_.addEventListener(
           'ready', this.onAuthReady_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'dialogShown', this.onDialogShown_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'dialogHidden', this.onDialogHidden_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'backButton', this.onBackButton_.bind(this));
       this.gaiaAuthHost_.addEventListener(
           'showView', this.onShowView_.bind(this));
-      this.gaiaAuthHost_.addEventListener('attemptLogin',
-                                          this.onAttemptLogin_.bind(this));
       this.gaiaAuthHost_.confirmPasswordCallback =
           this.onAuthConfirmPassword_.bind(this);
       this.gaiaAuthHost_.noPasswordCallback =
           this.onAuthNoPassword_.bind(this);
       this.gaiaAuthHost_.insecureContentBlockedCallback =
           this.onInsecureContentBlocked_.bind(this);
       this.gaiaAuthHost_.missingGaiaInfoCallback =
           this.missingGaiaInfo_.bind(this);
       this.gaiaAuthHost_.samlApiUsedCallback =
           this.samlApiUsed_.bind(this);
@@ skipping 455 matching lines @@
       if (this.errorBubble_) {
         this.showErrorBubble(this.errorBubble_[0], this.errorBubble_[1]);
         this.errorBubble_ = undefined;
       }
 
       chrome.send('loginWebuiReady');
       chrome.send('loginVisible', ['gaia-signin']);
     },
 
     /**
-     * Invoked when the auth host emits 'attemptLogin' event.
-     * @param {Object} Message object with |detail| field keeping email:
-     * like {detail: 'user@gmail.com'} .
-     * @private
-     */
-    onAttemptLogin_: function(e) {
-      chrome.send('attemptLogin', [e.detail]);
-    },
-
-    /**
      * Invoked when the user has successfully authenticated via SAML, the
      * principals API was not used and the auth host needs the user to confirm
      * the scraped password.
      * @param {string} email The authenticated user's e-mail.
      * @param {number} passwordCount The number of passwords that were scraped.
      * @private
      */
     onAuthConfirmPassword_: function(email, passwordCount) {
       this.loading = true;
       Oobe.getInstance().headerHidden = false;
@@ skipping 87 matching lines @@
         if (credentials.hasOwnProperty('authCodeOnly') &&
             credentials.authCodeOnly) {
           chrome.send('completeAuthenticationAuthCodeOnly',
                       [credentials.authCode]);
         } else {
           chrome.send('completeAuthentication', [
             credentials.gaiaId,
             credentials.email,
             credentials.password,
             credentials.authCode,
-            credentials.usingSAML,
-            credentials.deviceId
+            credentials.usingSAML
           ]);
         }
       } else {
         chrome.send('completeLogin',
                     [credentials.gaiaId,
                      credentials.email,
                      credentials.password,
                      credentials.usingSAML]);
       }
 
@@ skipping 184 matching lines @@
         $('gaia-whitelist-error').textContent =
             loadTimeData.getValue(isManaged ? 'whitelistErrorEnterprise' :
                                               'whitelistErrorConsumer');
       }
 
       this.classList.toggle('whitelist-error', show);
       this.loading = !show;
 
       if (!show)
         Oobe.showSigninUI();
-    },
-
-    /**
-     * Inform Gaia of new deviceId.
-     * @param {data} Object like {'deviceId': 'test-device-id'}
-     */
-    updateDeviceId: function(data) {
-      if (!this.isNewGaiaFlow)
-        return;
-
-      if (data && data.deviceId)
-        this.gaiaAuthHost_.updateDeviceId(data.deviceId);
-    },
+    }
   };
 });