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

Index: chrome/browser/resources/chromeos/login/screen_gaia_signin.js
diff --git a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
index e05e866219a63a6d5a780bb322074f8b6794fecf..42d17dd44d94d47804083ef4c11982b61d75e908 100644
--- a/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
+++ b/chrome/browser/resources/chromeos/login/screen_gaia_signin.js
@@ -33,7 +33,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
       'onFrameError',
       'updateCancelButtonState',
       'showWhitelistCheckFailedError',
-      'updateDeviceId',
     ],
 
     /**
@@ -755,8 +754,7 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
             credentials.email,
             credentials.password,
             credentials.authCode,
-            credentials.usingSAML,
-            credentials.deviceId
+            credentials.usingSAML
           ]);
         }
       } else {
@@ -961,18 +959,6 @@ login.createScreen('GaiaSigninScreen', 'gaia-signin', function() {
 
       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);
-    },
+    }
   };
 });