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

chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h

Index: chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
index abc6b3d86185f67b54fb86408e64f7beb515672b..7a7575c1977487ba4b9d357a6d2bf2e7e0db32b3 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h
@@ -53,14 +53,8 @@ struct GaiaContext {
   // GAIA ID of the current user.
   std::string gaia_id;
 
-  // Device Id of the current user.
-  std::string device_id;
-
   // Whether consumer management enrollment is in progress.
   bool is_enrolling_consumer_management;
-
-  // If user session would be ephemeral.
-  bool session_is_ephemeral;
 };
 
 // A class that handles WebUI hooks in Gaia screen.
@@ -121,8 +115,7 @@ class GaiaScreenHandler : public BaseScreenHandler {
                                     const std::string& email,
                                     const std::string& password,
                                     const std::string& auth_code,
-                                    bool using_saml,
-                                    const std::string& device_id);
+                                    bool using_saml);
   void HandleCompleteAuthenticationAuthCodeOnly(const std::string& auth_code);
   void HandleCompleteLogin(const std::string& gaia_id,
                            const std::string& typed_email,
@@ -137,8 +130,6 @@ class GaiaScreenHandler : public BaseScreenHandler {
 
   void HandleToggleEasyBootstrap();
 
-  void HandleAttemptLogin(const std::string& email);
-
   void HandleToggleWebviewSignin();
 
   // This is called when ConsumerManagementService::SetOwner() returns.
@@ -277,10 +268,6 @@ class GaiaScreenHandler : public BaseScreenHandler {
   // GAIA extension loader.
   scoped_ptr<ScopedGaiaAuthExtension> auth_extension_;
 
-  // Temporary DeviceId to be used for new users.
-  // If it's empty, new deviceId should be generated.
-  std::string temporary_device_id_;
-
   base::WeakPtrFactory<GaiaScreenHandler> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GaiaScreenHandler);