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

chrome/browser/chromeos/login/session/user_session_manager.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 "chrome/browser/chromeos/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 405 matching lines @@
 
   PreStartSession();
   CreateUserSession(user_context, has_auth_cookies);
 
   if (!has_active_session)
     StartCrosSession();
 
   // TODO(nkostylev): Notify UserLoggedIn() after profile is actually
   // ready to be used (http://crbug.com/361528).
   NotifyUserLoggedIn();
+
+  if (!user_context_.GetDeviceId().empty())

[pavely, 2015/05/13 00:05:52]

nit: Consider using user_context instead of user_context_? From reading just
this function it is not clear where user_context got copied into user_context_
(I know it happened in CreateUserSession)

[dzhioev (left Google), 2015/05/13 20:24:22]

Done.

+    user_manager::UserManager::Get()->SetKnownUserDeviceId(
+        user_context_.GetUserID(), user_context_.GetDeviceId());
+
   PrepareProfile();
 }
 
 void UserSessionManager::DelegateDeleted(UserSessionManagerDelegate* delegate) {
   if (delegate_ == delegate)
     delegate_ = nullptr;
 }
 
 void UserSessionManager::PerformPostUserLoggedInActions() {
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
@@ skipping 453 matching lines @@
 void UserSessionManager::InitProfilePreferences(
     Profile* profile,
     const UserContext& user_context) {
   const user_manager::User* user =
       ProfileHelper::Get()->GetUserByProfile(profile);
   if (user->GetType() == user_manager::USER_TYPE_KIOSK_APP &&
       profile->IsNewProfile()) {
     ChromeUserManager::Get()->SetIsCurrentUserNew(true);
   }
 
-  std::string device_id = profile->GetPrefs()->GetString(
-      prefs::kGoogleServicesSigninScopedDeviceId);
-  if (device_id.empty()) {
-    device_id = user_context.GetDeviceId();
-    if (!device_id.empty()) {
-      profile->GetPrefs()->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
-                                     device_id);
-    }
-  }
-  if (!device_id.empty()) {
-    user_manager::UserManager::Get()->SetKnownUserDeviceId(user->GetUserID(),
-                                                           device_id);
-  }
-
   if (user->is_active()) {
     input_method::InputMethodManager* manager =
         input_method::InputMethodManager::Get();
     manager->SetState(GetDefaultIMEState(profile));
   }
   if (user_manager::UserManager::Get()->IsCurrentUserNew()) {
     SetFirstLoginPrefs(profile,
                        user_context.GetPublicSessionLocale(),
                        user_context.GetPublicSessionInputMethod());
   }
@@ skipping 743 matching lines @@
     if (is_enterprise_managed)
       display = USER_PODS_DISPLAY_DISABLED_MANAGED;
     else
       display = USER_PODS_DISPLAY_DISABLED_REGULAR;
   }
   UMA_HISTOGRAM_ENUMERATION("UserSessionManager.UserPodsDisplay", display,
                             NUM_USER_PODS_DISPLAY);
 }
 
 }  // namespace chromeos