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

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2012 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/existing_user_controller.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
+#include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 59 matching lines @@
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
 namespace {
 
 // URL for account creation.
 const char kCreateAccountURL[] =
     "https://accounts.google.com/NewAccount?service=mail";
 
+const char kEphemeralUserDeviceIDPrefix[] = "t_";
+
 // Delay for transferring the auth cache to the system profile.
 const long int kAuthCacheTransferDelayMs = 2000;
 
 // Delay for restarting the ui if safe-mode login has failed.
 const long int kSafeModeRestartUiDelayMs = 30000;
 
 // Makes a call to the policy subsystem to reload the policy when we detect
 // authentication change.
 void RefreshPoliciesOnUIThread() {
   if (g_browser_process->policy_service())
@@ skipping 1010 matching lines @@
 
     // Re-enable clicking on other windows and the status area. Do not start the
     // auto-login timer though. On a disabled device, no auto-login can succeed.
     login_display_->SetUIEnabled(true);
     return;
   }
 
   continuation.Run();
 }
 
-void ExistingUserController::DoCompleteLogin(const UserContext& user_context) {
+void ExistingUserController::DoCompleteLogin(
+    const UserContext& user_context_wo_device_id) {

[achuithb, 2015/05/12 23:25:01]

Maybe call this user_context, and use uc for the stack variable?

we have a few other places where we do something similar to filling in some
state of user_context, and we don't have variable names like this in those
places.

[dzhioev (left Google), 2015/05/13 00:25:17]

'user_context' variable is used 5-6 times in this method. I prefer not to change
its name to keep history clear. I can rename it, if you insist.

+  UserContext user_context = user_context_wo_device_id;
+  std::string known_device_id =

[achuithb, 2015/05/12 23:25:01]

I'd suggest merging the variables known_device_id and new_device_id into
device_id. I think it would simplify the logic below.

[dzhioev (left Google), 2015/05/13 00:25:17]

Done.

+      user_manager::UserManager::Get()->GetKnownUserDeviceId(
+          user_context.GetUserID());
+  if (known_device_id.empty()) {
+    std::string new_device_id = base::GenerateGUID();
+    if (ChromeUserManager::Get()->AreEphemeralUsersEnabled() &&
+        user_context.GetUserID() != ChromeUserManager::Get()->GetOwnerEmail()) {
+      new_device_id = kEphemeralUserDeviceIDPrefix + new_device_id;
+    }
+    user_context.SetDeviceId(new_device_id);
+  } else {
+    user_context.SetDeviceId(known_device_id);
+  }
+
   PerformPreLoginActions(user_context);
 
   if (!time_init_.is_null()) {
     base::TimeDelta delta = base::Time::Now() - time_init_;
     UMA_HISTOGRAM_MEDIUM_TIMES("Login.PromptToCompleteLoginTime", delta);
     time_init_ = base::Time();  // Reset to null.
   }
 
   host_->OnCompleteLogin();
 
@@ skipping 121 matching lines @@
 void ExistingUserController::OnTokenHandleObtained(
     const user_manager::UserID& id,
     TokenHandleUtil::TokenHandleStatus status) {
   if (status != TokenHandleUtil::VALID) {
     LOG(ERROR) << "OAuth2 token handle fetch failed.";
     return;
   }
 }
 
 }  // namespace chromeos