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

Unified Diff: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_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
Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
index 9e6c82e2ea569e19ee34344094ee99188d8ed82d..16ec162d7ad93e5036bb42dae04a3691f7040bc0 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
@@ -150,7 +150,8 @@ class WallpaperManagerPolicyTest
base::FilePath user_keys_dir;
EXPECT_TRUE(PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));
const std::string sanitized_user_id =
- CryptohomeClient::GetStubSanitizedUsername(account_id.GetUserEmail());
+ CryptohomeClient::GetStubSanitizedUsername(
+ cryptohome::Identification(account_id));
const base::FilePath user_key_file =
user_keys_dir.AppendASCII(sanitized_user_id)
.AppendASCII("policy.pub");
@@ -252,8 +253,8 @@ class WallpaperManagerPolicyTest
builder->payload().Clear();
}
builder->Build();
- fake_session_manager_client_->set_user_policy(account_id.GetUserEmail(),
- builder->GetBlob());
+ fake_session_manager_client_->set_user_policy(
+ cryptohome::Identification(account_id), builder->GetBlob());
const user_manager::User* user =
user_manager::UserManager::Get()->FindUser(account_id);
ASSERT_TRUE(user);

Powered by Google App Engine
This is Rietveld 408576698