chrome/browser/policy/cloud/cloud_policy_browsertest.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/policy/cloud/cloud_policy_browsertest.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: Add cryptohome::Identification() . 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

« chrome/browser/chromeos/app_mode/kiosk_app_manager.cc ('K') | « chrome/browser/extensions/api/networking_private/networking_private_chromeos_apitest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | chromeos/chromeos.gyp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc

index 01effae0d6c238dcdfd3c270e12bdc34234c958c..f1be6c198aee75ab81a08a37cab2981f2685b04c 100644

--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc

+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc

@@ -54,8 +54,10 @@

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"

#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"

#include "chromeos/chromeos_paths.h"

+#include "chromeos/cryptohome/cryptohome_parameters.h"

#include "chromeos/dbus/cryptohome_client.h"

#include "chromeos/login/user_names.h"

+#include "components/signin/core/account_id/account_id.h"

#else

#include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"

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

@@ -322,7 +324,9 @@ class CloudPolicyTest : public InProcessBrowserTest,

ASSERT_TRUE(

PathService::Get(chromeos::DIR_USER_POLICY_KEYS, &user_policy_key_dir));

std::string sanitized_username =

- chromeos::CryptohomeClient::GetStubSanitizedUsername(GetTestUser());

+ chromeos::CryptohomeClient::GetStubSanitizedUsername(

+ cryptohome::Identification(

+ AccountId::FromUserEmail(GetTestUser())));

user_policy_key_file_ = user_policy_key_dir.AppendASCII(sanitized_username)

.AppendASCII("policy.pub");

#endif