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

chromeos/login/auth/user_context.cc

 // Copyright 2014 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.
 
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/login/user_names.h"
 
 namespace chromeos {
 
 UserContext::UserContext()
     : is_using_oauth_(true),
       auth_flow_(AUTH_FLOW_OFFLINE),
       user_type_(user_manager::USER_TYPE_REGULAR) {
 }
 
 UserContext::UserContext(const UserContext& other)
     : user_id_(other.user_id_),
       gaia_id_(other.gaia_id_),
       key_(other.key_),
       auth_code_(other.auth_code_),
       refresh_token_(other.refresh_token_),
       access_token_(other.access_token_),
       user_id_hash_(other.user_id_hash_),
       is_using_oauth_(other.is_using_oauth_),
       auth_flow_(other.auth_flow_),
       user_type_(other.user_type_),
       public_session_locale_(other.public_session_locale_),
-      public_session_input_method_(other.public_session_input_method_) {
+      public_session_input_method_(other.public_session_input_method_),
+      device_id_(other.device_id_) {
 }
 
 UserContext::UserContext(const std::string& user_id)
     : user_id_(login::CanonicalizeUserID(user_id)),
       is_using_oauth_(true),
       auth_flow_(AUTH_FLOW_OFFLINE),
       user_type_(user_manager::USER_TYPE_REGULAR) {
 }
 
 UserContext::UserContext(user_manager::UserType user_type,
@@ skipping 139 matching lines @@
   device_id_ = device_id;
 }
 
 void UserContext::ClearSecrets() {
   key_.ClearSecret();
   auth_code_.clear();
   refresh_token_.clear();
 }
 
 }  // namespace chromeos