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

 // Copyright 2013 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 35 matching lines @@
 
   // True if user list is non-empty.
   bool has_users;
 
   // Email of the current user.
   std::string email;
 
   // 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.
 class GaiaScreenHandler : public BaseScreenHandler {
  public:
   enum FrameState {
     FRAME_STATE_UNKNOWN = 0,
     FRAME_STATE_LOADING,
     FRAME_STATE_LOADED,
     FRAME_STATE_ERROR
@@ skipping 40 matching lines @@
   // WebUIMessageHandler implementation:
   void RegisterMessages() override;
 
   // WebUI message handlers.
   void HandleFrameLoadingCompleted(int status);
   void HandleWebviewLoadAborted(const std::string& error_reason_str);
   void HandleCompleteAuthentication(const std::string& gaia_id,
                                     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,
                            const std::string& password,
                            bool using_saml);
 
   void HandleUsingSAMLAPI();
   void HandleScrapedPasswordCount(int password_count);
   void HandleScrapedPasswordVerificationFailed();
 
@@ skipping 134 matching lines @@
 
   // Non-owning ptr to SigninScreenHandler instance. Should not be used
   // in dtor.
   // TODO (antrim@): GaiaScreenHandler shouldn't communicate with
   // signin_screen_handler directly.
   SigninScreenHandler* signin_screen_handler_;
 
   // 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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_GAIA_SCREEN_HANDLER_H_