Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2678)

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: 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/extensions/extension_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 360fc362a522516b365ba6e80b3858c31d3a2fcc..b660aa0a16bdde9d24b0515690b453f18a1c476b 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"
@@ -334,7 +336,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
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.cc ('k') | chrome/browser/profiles/profile_io_data.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698