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

components/user_manager/user_manager_base.cc

Index: components/user_manager/user_manager_base.cc
diff --git a/components/user_manager/user_manager_base.cc b/components/user_manager/user_manager_base.cc
index 8b1feae462c471bda2f6f5243b6947349dce7510..3e11ff871068bace74871ce0cb3bbe828229cce5 100644
--- a/components/user_manager/user_manager_base.cc
+++ b/components/user_manager/user_manager_base.cc
@@ -1148,6 +1148,10 @@ bool UserManagerBase::FindGaiaID(const UserID& user_id,
 
 void UserManagerBase::SetKnownUserDeviceId(const UserID& user_id,
                                            const std::string& device_id) {
+  const std::string known_device_id = GetKnownUserDeviceId(user_id);
+  if (!known_device_id.empty() && device_id != known_device_id) {
+    NOTREACHED() << "Trying to change device ID for known user.";

[xiyuan, 2015/05/13 01:18:02]

nit: LOG(WARNING)/LOG(ERROR) or LOG(FATAL) to get a crash report.

[dzhioev (left Google), 2015/05/14 23:50:52]

Ditto.

+  }
   SetKnownUserStringPref(user_id, kDeviceId, device_id);
 }