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

components/user_manager/user_manager_base.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 "components/user_manager/user_manager_base.h"
 
 #include <cstddef>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1130 matching lines @@
   SetKnownUserStringPref(user_id, kGAIAIdKey, gaia_id);
 }
 
 bool UserManagerBase::FindGaiaID(const UserID& user_id,
                                  std::string* out_value) {
   return GetKnownUserStringPref(user_id, kGAIAIdKey, out_value);
 }
 
 void UserManagerBase::SetKnownUserDeviceId(const UserID& user_id,
                                            const std::string& device_id) {
+  std::string known_device_id = GetKnownUserDeviceId(user_id);

[achuithb, 2015/05/12 23:25:01]

nit: const

[dzhioev (left Google), 2015/05/13 00:25:18]

Done.

+  if (!known_device_id.empty() && device_id != known_device_id) {

[achuithb, 2015/05/12 23:25:01]

Should this just be a DCHECK?

[dzhioev (left Google), 2015/05/13 00:25:18]

Want this to be logged in Release mode.

+    NOTREACHED() << "Trying to change device ID for known user.";
+  }
   SetKnownUserStringPref(user_id, kDeviceId, device_id);
 }
 
 std::string UserManagerBase::GetKnownUserDeviceId(const UserID& user_id) {
   std::string device_id;
   if (GetKnownUserStringPref(user_id, kDeviceId, &device_id)) {
     return device_id;
   }
   return std::string();
 }
@@ skipping 158 matching lines @@
 }
 
 void UserManagerBase::DeleteUser(User* user) {
   const bool is_active_user = (user == active_user_);
   delete user;
   if (is_active_user)
     active_user_ = NULL;
 }
 
 }  // namespace user_manager