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

chrome/browser/signin/chrome_signin_client.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/signin/chrome_signin_client.h"
 
 #include "base/command_line.h"
 #include "base/guid.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 15 matching lines @@
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #endif
 
 #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
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/first_run/first_run.h"
 #endif
 
 ChromeSigninClient::ChromeSigninClient(
     Profile* profile, SigninErrorController* signin_error_controller)
     : profile_(profile),
       signin_error_controller_(signin_error_controller) {
   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
 }
 
 ChromeSigninClient::~ChromeSigninClient() {
   signin_error_controller_->RemoveObserver(this);
 }
 
 void ChromeSigninClient::Shutdown() {
 #if !defined(OS_CHROMEOS)
   net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
@@ skipping 46 matching lines @@
 #endif
   return true;
 }
 
 std::string ChromeSigninClient::GetSigninScopedDeviceId() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableSigninScopedDeviceId)) {
     return std::string();
   }
 
+#if !defined(OS_CHROMEOS)
   std::string signin_scoped_device_id =
       GetPrefs()->GetString(prefs::kGoogleServicesSigninScopedDeviceId);
   if (signin_scoped_device_id.empty()) {
     // If device_id doesn't exist then generate new and save in prefs.
     signin_scoped_device_id = base::GenerateGUID();
     DCHECK(!signin_scoped_device_id.empty());
     GetPrefs()->SetString(prefs::kGoogleServicesSigninScopedDeviceId,
                           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() {
   GetPrefs()->ClearPref(prefs::kGoogleServicesSigninScopedDeviceId);
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
 
   // If sign out occurs because Sync setup was in progress and the Profile got
   // deleted, then the profile's no longer in the ProfileInfoCache.
@@ skipping 123 matching lines @@
   return;
 #else
   // Don't bother if we don't have any kind of network connection.
   if (net::NetworkChangeNotifier::IsOffline()) {
     delayed_callbacks_.push_back(callback);
   } else {
     callback.Run();
   }
 #endif
 }