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..c8ccdd795719c72da8f7ad257e4247c1b97ed660 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) {
+  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);
 }