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

chrome/browser/signin/chrome_signin_client.cc

Index: chrome/browser/signin/chrome_signin_client.cc
diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/signin/chrome_signin_client.cc
index a98dd89930a065fbedb05edce03982d03b268889..116e79056549fff4c16b12ce8354e39c83c5c11e 100644
--- a/chrome/browser/signin/chrome_signin_client.cc
+++ b/chrome/browser/signin/chrome_signin_client.cc
@@ -33,6 +33,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/net/delay_network_call.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "components/user_manager/user_manager.h"
 #endif
 
@@ -47,6 +48,27 @@ ChromeSigninClient::ChromeSigninClient(
   signin_error_controller_->AddObserver(this);
 #if !defined(OS_CHROMEOS)
   net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
+#else
+  // UserManager may not exist in unit_tests.
+  if (!user_manager::UserManager::IsInitialized())
+    return;
+
+  const user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+  if (!user)
+    return;
+
+  // Need to move device ID from the old location to the new one, if it has not
+  // been done yet.
+  const std::string legacy_device_id =
+      GetPrefs()->GetString(prefs::kGoogleServicesSigninScopedDeviceId);
+  auto* user_manager = user_manager::UserManager::Get();
+  if (!legacy_device_id.empty() &&
+      user_manager->GetKnownUserDeviceId(user->GetUserID()).empty()) {
+    user_manager->SetKnownUserDeviceId(user->GetUserID(), legacy_device_id);
+  }
+  GetPrefs()->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
+                        std::string());
 #endif
 }
 
@@ -113,6 +135,7 @@ std::string ChromeSigninClient::GetSigninScopedDeviceId() {
     return std::string();
   }
 
+#if !defined(OS_CHROMEOS)
   std::string signin_scoped_device_id =
       GetPrefs()->GetString(prefs::kGoogleServicesSigninScopedDeviceId);
   if (signin_scoped_device_id.empty()) {
@@ -123,6 +146,22 @@ std::string ChromeSigninClient::GetSigninScopedDeviceId() {
                           signin_scoped_device_id);
   }
   return signin_scoped_device_id;
+#else
+  // UserManager may not exist in unit_tests.
+  if (!user_manager::UserManager::IsInitialized())
+    return std::string();
+
+  const user_manager::User* user =
+      chromeos::ProfileHelper::Get()->GetUserByProfile(profile_);
+  if (!user)
+    return std::string();
+
+  const std::string signin_scoped_device_id =
+      user_manager::UserManager::Get()->GetKnownUserDeviceId(user->GetUserID());
+  if (signin_scoped_device_id.empty())
+    LOG(ERROR) << "Device ID is not set for user.";

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

nit: LOG_IF(ERROR, signin_scoped_device_id.empty()) << ...

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

Done.

+  return signin_scoped_device_id;
+#endif
 }
 
 void ChromeSigninClient::OnSignedOut() {