chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc - Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed unit tests. Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chromeos/login/demo_mode/demo_app_launcher.cc ('k') | chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

diff --git a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

index 6b3a82be6887a6ce4833d2d4d11e44eb7b990dca..536e7c28ffaf68bef5806ab77331a610397fb9fd 100644

--- a/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

+++ b/chrome/browser/chromeos/login/easy_unlock/bootstrap_user_context_initializer.cc

@@ -12,6 +12,8 @@

#include "chrome/browser/chromeos/login/session/user_session_manager.h"

#include "chrome/browser/chromeos/profiles/profile_helper.h"

#include "chrome/browser/signin/easy_unlock_service_signin_chromeos.h"

+#include "chromeos/login/user_names.h"

+#include "components/user_manager/known_user.h"

#include "components/user_manager/user_manager.h"

#include "crypto/random.h"

#include "google_apis/gaia/gaia_constants.h"

@@ -175,8 +177,8 @@ void BootstrapUserContextInitializer::OnGetUserInfoResponse(

return;

}

- user_context_.SetUserID(email);

- user_context_.SetGaiaID(gaia_id);

+ user_context_.SetAccountId(user_manager::known_user::GetAccountId(

+ login::CanonicalizeUserID(email), gaia_id));

StartCheckExistingKeys();

}