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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

Issue 1412813003: This CL replaces user_manager::UserID with AccountId. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@468875--Chrome-OS-handles-deletion-of-Gmail-account-poorly--Create-AccountID-structure-part2--user_names
Patch Set: Fixed tests. Created 5 years, 2 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
« ash/test/test_session_state_delegate.cc ('K') | « chrome/browser/chromeos/login/user_flow.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
diff --git a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
index b3ceb68823e0975284a0bf2f1057b41b1ad5d0b6..df16843623c507cab69528cabec4555905a3e901 100644
--- a/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc
@@ -103,8 +103,9 @@ policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {
class UserImageManagerTest : public LoginManagerTest,
public user_manager::UserManager::Observer {
protected:
- UserImageManagerTest() : LoginManagerTest(true) {
- }
+ UserImageManagerTest()
+ : LoginManagerTest(true),
+ enterprise_account_id_(AccountId::FromUserEmail(kEnterpriseUser1)) {}
// LoginManagerTest overrides:
void SetUpInProcessBrowserTestFixture() override {
@@ -131,32 +132,35 @@ class UserImageManagerTest : public LoginManagerTest,
run_loop_->Quit();
}
- // Logs in |username|.
- void LogIn(const std::string& username) {
- user_manager::UserManager::Get()->UserLoggedIn(username, username, false);
+ // Logs in |account_id|.
+ void LogIn(const AccountId& account_id) {
+ user_manager::UserManager::Get()->UserLoggedIn(
+ account_id, account_id.GetUserEmail(), false);
}
// Stores old (pre-migration) user image info.
- void SetOldUserImageInfo(const std::string& username,
+ void SetOldUserImageInfo(const AccountId& account_id,
int image_index,
const base::FilePath& image_path) {
- RegisterUser(username);
+ RegisterUser(account_id.GetUserEmail());
DictionaryPrefUpdate images_pref(local_state_, "UserImages");
base::DictionaryValue* image_properties = new base::DictionaryValue();
image_properties->Set("index", new base::FundamentalValue(image_index));
image_properties->Set(
"path" , new base::StringValue(image_path.value()));
- images_pref->SetWithoutPathExpansion(username, image_properties);
+ images_pref->SetWithoutPathExpansion(account_id.GetUserEmail(),
+ image_properties);
}
// Verifies user image info in |images_pref| dictionary.
void ExpectUserImageInfo(const base::DictionaryValue* images_pref,
- const std::string& username,
+ const AccountId& account_id,
int image_index,
const base::FilePath& image_path) {
ASSERT_TRUE(images_pref);
const base::DictionaryValue* image_properties = NULL;
- images_pref->GetDictionaryWithoutPathExpansion(username, &image_properties);
+ images_pref->GetDictionaryWithoutPathExpansion(account_id.GetUserEmail(),
+ &image_properties);
ASSERT_TRUE(image_properties);
int actual_image_index;
std::string actual_image_path;
@@ -166,42 +170,42 @@ class UserImageManagerTest : public LoginManagerTest,
EXPECT_EQ(image_path.value(), actual_image_path);
}
- // Verifies that there is no image info for |username| in dictionary
+ // Verifies that there is no image info for |account_id| in dictionary
// |images_pref|.
void ExpectNoUserImageInfo(const base::DictionaryValue* images_pref,
- const std::string& username) {
+ const AccountId& account_id) {
ASSERT_TRUE(images_pref);
const base::DictionaryValue* image_properties = NULL;
- images_pref->GetDictionaryWithoutPathExpansion(username, &image_properties);
+ images_pref->GetDictionaryWithoutPathExpansion(account_id.GetUserEmail(),
+ &image_properties);
ASSERT_FALSE(image_properties);
}
// Verifies that old user image info matches |image_index| and |image_path|
// and that new user image info does not exist.
- void ExpectOldUserImageInfo(const std::string& username,
+ void ExpectOldUserImageInfo(const AccountId& account_id,
int image_index,
const base::FilePath& image_path) {
- ExpectUserImageInfo(local_state_->GetDictionary("UserImages"),
- username, image_index, image_path);
+ ExpectUserImageInfo(local_state_->GetDictionary("UserImages"), account_id,
+ image_index, image_path);
ExpectNoUserImageInfo(local_state_->GetDictionary("user_image_info"),
- username);
+ account_id);
}
// Verifies that new user image info matches |image_index| and |image_path|
// and that old user image info does not exist.
- void ExpectNewUserImageInfo(const std::string& username,
+ void ExpectNewUserImageInfo(const AccountId& account_id,
int image_index,
const base::FilePath& image_path) {
ExpectUserImageInfo(local_state_->GetDictionary("user_image_info"),
- username, image_index, image_path);
+ account_id, image_index, image_path);
ExpectNoUserImageInfo(local_state_->GetDictionary("UserImages"),
- username);
+ account_id);
}
- // Sets bitmap |resource_id| as image for |username| and saves it to disk.
- void SaveUserImagePNG(const std::string& username,
- int resource_id) {
- base::FilePath image_path = GetUserImagePath(username, "png");
+ // Sets bitmap |resource_id| as image for |account_id| and saves it to disk.
+ void SaveUserImagePNG(const AccountId& account_id, int resource_id) {
+ base::FilePath image_path = GetUserImagePath(account_id, "png");
scoped_refptr<base::RefCountedStaticMemory> image_data(
ResourceBundle::GetSharedInstance().LoadDataResourceBytesForScale(
resource_id, ui::SCALE_FACTOR_100P));
@@ -210,28 +214,29 @@ class UserImageManagerTest : public LoginManagerTest,
reinterpret_cast<const char*>(image_data->front()),
image_data->size());
EXPECT_EQ(static_cast<int>(image_data->size()), written);
- SetOldUserImageInfo(
- username, user_manager::User::USER_IMAGE_EXTERNAL, image_path);
+ SetOldUserImageInfo(account_id, user_manager::User::USER_IMAGE_EXTERNAL,
+ image_path);
}
- // Returns the image path for user |username| with specified |extension|.
- base::FilePath GetUserImagePath(const std::string& username,
+ // Returns the image path for user |account_id| with specified |extension|.
+ base::FilePath GetUserImagePath(const AccountId& account_id,
const std::string& extension) {
- return user_data_dir_.Append(username).AddExtension(extension);
+ return user_data_dir_.Append(account_id.GetUserEmail())
+ .AddExtension(extension);
}
// Seeds the AccountTrackerService with test data so the ProfileDownloader can
// retrieve the picture URL and fetch the image.
- void SeedAccountTrackerService(const std::string& username,
+ void SeedAccountTrackerService(const AccountId& account_id,
Profile* profile) {
AccountInfo info;
info.account_id = std::string();
- info.gaia = username;
- info.email = username;
- info.full_name = username;
- info.given_name = username;
+ info.gaia = account_id.GetUserEmail();
+ info.email = account_id.GetUserEmail();
+ info.full_name = account_id.GetUserEmail();
+ info.given_name = account_id.GetUserEmail();
info.hosted_domain = std::string();
- info.locale = username;
+ info.locale = account_id.GetUserEmail();
info.picture_url = "http://localhost/avatar.jpg";
info.is_child_account = false;
@@ -239,16 +244,16 @@ class UserImageManagerTest : public LoginManagerTest,
}
// Completes the download of all non-image profile data for the user
- // |username|. This method must only be called after a profile data
+ // |account_id|. This method must only be called after a profile data
// download has been started. |url_fetcher_factory| will capture
// the net::TestURLFetcher created by the ProfileDownloader to
// download the profile image.
void CompleteProfileMetadataDownload(
- const std::string& username,
+ const AccountId& account_id,
net::TestURLFetcherFactory* url_fetcher_factory) {
ProfileDownloader* profile_downloader =
reinterpret_cast<UserImageManagerImpl*>(
- ChromeUserManager::Get()->GetUserImageManager(username))
+ ChromeUserManager::Get()->GetUserImageManager(account_id))
->profile_downloader_.get();
ASSERT_TRUE(profile_downloader);
@@ -290,7 +295,7 @@ class UserImageManagerTest : public LoginManagerTest,
user_manager::UserManager::Get()->GetLoggedInUser();
ASSERT_TRUE(user);
UserImageManagerImpl* uim = reinterpret_cast<UserImageManagerImpl*>(
- ChromeUserManager::Get()->GetUserImageManager(user->email()));
+ ChromeUserManager::Get()->GetUserImageManager(user->GetAccountId()));
if (uim->job_.get()) {
run_loop_.reset(new base::RunLoop);
run_loop_->Run();
@@ -306,6 +311,10 @@ class UserImageManagerTest : public LoginManagerTest,
scoped_ptr<base::RunLoop> run_loop_;
+ const AccountId test_account_id1_ = AccountId::FromUserEmail(kTestUser1);
+ const AccountId test_account_id2_ = AccountId::FromUserEmail(kTestUser2);
+ const AccountId enterprise_account_id_;
+
private:
DISALLOW_COPY_AND_ASSIGN(UserImageManagerTest);
};
@@ -313,49 +322,56 @@ class UserImageManagerTest : public LoginManagerTest,
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_DefaultUserImagePreserved) {
// Setup an old default (stock) user image.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ SetOldUserImageInfo(test_account_id1_, user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, DefaultUserImagePreserved) {
user_manager::UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- LogIn(kTestUser1);
+ ExpectOldUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
+ LogIn(test_account_id1_);
// Image info is migrated now.
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {
// Setup two users with stock images.
ScopedUserManagerEnabler(new MockUserManager);
- SetOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- SetOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
+ SetOldUserImageInfo(test_account_id1_, user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
+ SetOldUserImageInfo(test_account_id2_,
+ user_manager::kFirstDefaultImageIndex + 1,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {
user_manager::UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
- LogIn(kTestUser1);
+ ExpectOldUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
+ ExpectOldUserImageInfo(test_account_id2_,
+ user_manager::kFirstDefaultImageIndex + 1,
+ base::FilePath());
+ LogIn(test_account_id1_);
// Image info is migrated for the first user and unaffected for the rest.
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
- ExpectOldUserImageInfo(
- kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());
+ ExpectNewUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
+ ExpectOldUserImageInfo(test_account_id2_,
+ user_manager::kFirstDefaultImageIndex + 1,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {
// Setup a user with non-JPEG image.
ScopedUserManagerEnabler(new MockUserManager);
- SaveUserImagePNG(kTestUser1,
+ SaveUserImagePNG(test_account_id1_,
user_manager::kDefaultImageResourceIDs
[user_manager::kFirstDefaultImageIndex]);
}
@@ -363,26 +379,26 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
user_manager::UserManager::Get()->GetUsers(); // Load users.
// Old info preserved.
- ExpectOldUserImageInfo(kTestUser1,
+ ExpectOldUserImageInfo(test_account_id1_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kTestUser1, "png"));
+ GetUserImagePath(test_account_id1_, "png"));
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
EXPECT_TRUE(user->image_is_stub());
base::RunLoop run_loop;
PrefChangeRegistrar pref_change_registrar_;
pref_change_registrar_.Init(local_state_);
pref_change_registrar_.Add("UserImages", run_loop.QuitClosure());
- LogIn(kTestUser1);
+ LogIn(test_account_id1_);
// Wait for migration.
run_loop.Run();
// Image info is migrated and the image is converted to JPG.
- ExpectNewUserImageInfo(kTestUser1,
+ ExpectNewUserImageInfo(test_account_id1_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kTestUser1, "jpg"));
+ GetUserImagePath(test_account_id1_, "jpg"));
user = user_manager::UserManager::Get()->GetLoggedInUser();
ASSERT_TRUE(user);
EXPECT_FALSE(user->image_is_safe_format());
@@ -396,7 +412,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_NonJPEGImageFromFile) {
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
user_manager::UserManager::Get()->GetUsers(); // Load users.
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
// Wait for image load.
if (user->image_index() == user_manager::User::USER_IMAGE_INVALID) {
@@ -414,40 +430,41 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserDefaultImageIndex) {
- RegisterUser(kTestUser1);
+ RegisterUser(test_account_id1_.GetUserEmail());
}
// Verifies that SaveUserDefaultImageIndex() correctly sets and persists the
// chosen user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserDefaultImageIndex) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
+ ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
user_image_manager->SaveUserDefaultImageIndex(
user_manager::kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {
- RegisterUser(kTestUser1);
+ RegisterUser(test_account_id1_.GetUserEmail());
}
// Verifies that SaveUserImage() correctly sets and persists the chosen user
// image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
SkBitmap custom_image_bitmap;
@@ -459,7 +476,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
+ ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
user_image_manager->SaveUserImage(
user_manager::UserImage::CreateAndEncode(custom_image));
run_loop_->Run();
@@ -467,12 +484,12 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(custom_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1,
+ ExpectNewUserImageInfo(test_account_id1_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kTestUser1, "jpg"));
+ GetUserImagePath(test_account_id1_, "jpg"));
const scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(test_account_id1_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -481,14 +498,14 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {
}
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImageFromFile) {
- RegisterUser(kTestUser1);
+ RegisterUser(test_account_id1_.GetUserEmail());
}
// Verifies that SaveUserImageFromFile() correctly sets and persists the chosen
// user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
const base::FilePath custom_image_path =
@@ -499,19 +516,19 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
+ ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
user_image_manager->SaveUserImageFromFile(custom_image_path);
run_loop_->Run();
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(*custom_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1,
+ ExpectNewUserImageInfo(test_account_id1_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kTestUser1, "jpg"));
+ GetUserImagePath(test_account_id1_, "jpg"));
const scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(test_account_id1_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -521,7 +538,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {
IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
PRE_SaveUserImageFromProfileImage) {
- RegisterUser(kTestUser1);
+ RegisterUser(test_account_id1_.GetUserEmail());
chromeos::StartupUtils::MarkOobeCompleted();
}
@@ -529,22 +546,22 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
// persists the chosen user image.
IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
- LoginUser(kTestUser1);
+ LoginUser(test_account_id1_.GetUserEmail());
Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
- SeedAccountTrackerService(kTestUser1, profile);
+ SeedAccountTrackerService(test_account_id1_, profile);
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
+ ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
user_image_manager->SaveUserImageFromProfileImage();
run_loop_->Run();
net::TestURLFetcherFactory url_fetcher_factory;
- CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
+ CompleteProfileMetadataDownload(test_account_id1_, &url_fetcher_factory);
CompleteProfileImageDownload(&url_fetcher_factory);
const gfx::ImageSkia& profile_image =
@@ -553,12 +570,12 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_PROFILE, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(profile_image, user->GetImage()));
- ExpectNewUserImageInfo(kTestUser1,
+ ExpectNewUserImageInfo(test_account_id1_,
user_manager::User::USER_IMAGE_PROFILE,
- GetUserImagePath(kTestUser1, "jpg"));
+ GetUserImagePath(test_account_id1_, "jpg"));
const scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(test_account_id1_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -568,7 +585,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromProfileImage) {
IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
PRE_ProfileImageDownloadDoesNotClobber) {
- RegisterUser(kTestUser1);
+ RegisterUser(test_account_id1_.GetUserEmail());
chromeos::StartupUtils::MarkOobeCompleted();
}
@@ -579,25 +596,25 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
ProfileImageDownloadDoesNotClobber) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kTestUser1);
+ user_manager::UserManager::Get()->FindUser(test_account_id1_);
ASSERT_TRUE(user);
const gfx::ImageSkia& default_image =
user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();
- LoginUser(kTestUser1);
+ LoginUser(test_account_id1_.GetUserEmail());
Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);
- SeedAccountTrackerService(kTestUser1, profile);
+ SeedAccountTrackerService(test_account_id1_, profile);
run_loop_.reset(new base::RunLoop);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);
+ ChromeUserManager::Get()->GetUserImageManager(test_account_id1_);
user_image_manager->SaveUserImageFromProfileImage();
run_loop_->Run();
net::TestURLFetcherFactory url_fetcher_factory;
- CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);
+ CompleteProfileMetadataDownload(test_account_id1_, &url_fetcher_factory);
user_image_manager->SaveUserDefaultImageIndex(
user_manager::kFirstDefaultImageIndex);
@@ -607,8 +624,9 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
EXPECT_TRUE(user->HasDefaultImage());
EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(
- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());
+ ExpectNewUserImageInfo(test_account_id1_,
+ user_manager::kFirstDefaultImageIndex,
+ base::FilePath());
}
class UserImageManagerPolicyTest : public UserImageManagerTest,
@@ -632,7 +650,8 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
ASSERT_TRUE(PathService::Get(chromeos::DIR_USER_POLICY_KEYS,
&user_keys_dir));
const std::string sanitized_username =
- chromeos::CryptohomeClient::GetStubSanitizedUsername(kEnterpriseUser1);
+ chromeos::CryptohomeClient::GetStubSanitizedUsername(
+ enterprise_account_id_.GetUserEmail());
const base::FilePath user_key_file =
user_keys_dir.AppendASCII(sanitized_username)
.AppendASCII("policy.pub");
@@ -644,7 +663,8 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
reinterpret_cast<const char*>(user_key_bits.data()),
user_key_bits.size()),
static_cast<int>(user_key_bits.size()));
- user_policy_.policy_data().set_username(kEnterpriseUser1);
+ user_policy_.policy_data().set_username(
+ enterprise_account_id_.GetUserEmail());
policy_image_ = test::ImageLoader(test_data_dir_.Append(
test::kUserAvatarImage2RelativePath)).Load();
@@ -688,7 +708,7 @@ class UserImageManagerPolicyTest : public UserImageManagerTest,
};
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) {
- RegisterUser(kEnterpriseUser1);
+ RegisterUser(enterprise_account_id_.GetUserEmail());
chromeos::StartupUtils::MarkOobeCompleted();
}
@@ -698,10 +718,10 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) {
// http://crbug.com/396352
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kEnterpriseUser1);
+ user_manager::UserManager::Get()->FindUser(enterprise_account_id_);
ASSERT_TRUE(user);
- LoginUser(kEnterpriseUser1);
+ LoginUser(enterprise_account_id_.GetUserEmail());
base::RunLoop().RunUntilIdle();
policy::CloudPolicyStore* store = GetStoreForUser(user);
@@ -712,8 +732,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
user_policy_.payload().mutable_useravatarimage()->set_value(
ConstructPolicy(test::kUserAvatarImage2RelativePath));
user_policy_.Build();
- fake_session_manager_client_->set_user_policy(kEnterpriseUser1,
- user_policy_.GetBlob());
+ fake_session_manager_client_->set_user_policy(
+ enterprise_account_id_.GetUserEmail(), user_policy_.GetBlob());
run_loop_.reset(new base::RunLoop);
store->Load();
run_loop_->Run();
@@ -721,12 +741,12 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1,
+ ExpectNewUserImageInfo(enterprise_account_id_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kEnterpriseUser1, "jpg"));
+ GetUserImagePath(enterprise_account_id_, "jpg"));
scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -737,8 +757,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
// image.
user_policy_.payload().Clear();
user_policy_.Build();
- fake_session_manager_client_->set_user_policy(kEnterpriseUser1,
- user_policy_.GetBlob());
+ fake_session_manager_client_->set_user_policy(
+ enterprise_account_id_.GetUserEmail(), user_policy_.GetBlob());
run_loop_.reset(new base::RunLoop);
store->AddObserver(this);
store->Load();
@@ -755,7 +775,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
const gfx::ImageSkia& default_image =
user_manager::GetDefaultImage(default_image_index);
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1, default_image_index,
+ ExpectNewUserImageInfo(enterprise_account_id_, default_image_index,
base::FilePath());
// Choose a different user image. Verify that the chosen user image is set and
@@ -768,17 +788,18 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, DISABLED_SetAndClear) {
user_manager::GetDefaultImage(user_image_index);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kEnterpriseUser1);
+ ChromeUserManager::Get()->GetUserImageManager(enterprise_account_id_);
user_image_manager->SaveUserDefaultImageIndex(user_image_index);
EXPECT_TRUE(user->HasDefaultImage());
EXPECT_EQ(user_image_index, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(user_image, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1, user_image_index, base::FilePath());
+ ExpectNewUserImageInfo(enterprise_account_id_, user_image_index,
+ base::FilePath());
}
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_PolicyOverridesUser) {
- RegisterUser(kEnterpriseUser1);
+ RegisterUser(enterprise_account_id_.GetUserEmail());
chromeos::StartupUtils::MarkOobeCompleted();
}
@@ -787,10 +808,10 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_PolicyOverridesUser) {
// previously chosen image.
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kEnterpriseUser1);
+ user_manager::UserManager::Get()->FindUser(enterprise_account_id_);
ASSERT_TRUE(user);
- LoginUser(kEnterpriseUser1);
+ LoginUser(enterprise_account_id_.GetUserEmail());
base::RunLoop().RunUntilIdle();
policy::CloudPolicyStore* store = GetStoreForUser(user);
@@ -802,14 +823,14 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kEnterpriseUser1);
+ ChromeUserManager::Get()->GetUserImageManager(enterprise_account_id_);
user_image_manager->SaveUserDefaultImageIndex(
user_manager::kFirstDefaultImageIndex);
EXPECT_TRUE(user->HasDefaultImage());
EXPECT_EQ(user_manager::kFirstDefaultImageIndex, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(default_image, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1,
+ ExpectNewUserImageInfo(enterprise_account_id_,
user_manager::kFirstDefaultImageIndex,
base::FilePath());
@@ -818,8 +839,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
user_policy_.payload().mutable_useravatarimage()->set_value(
ConstructPolicy(test::kUserAvatarImage2RelativePath));
user_policy_.Build();
- fake_session_manager_client_->set_user_policy(kEnterpriseUser1,
- user_policy_.GetBlob());
+ fake_session_manager_client_->set_user_policy(
+ enterprise_account_id_.GetUserEmail(), user_policy_.GetBlob());
run_loop_.reset(new base::RunLoop);
store->Load();
run_loop_->Run();
@@ -827,12 +848,12 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1,
+ ExpectNewUserImageInfo(enterprise_account_id_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kEnterpriseUser1, "jpg"));
+ GetUserImagePath(enterprise_account_id_, "jpg"));
scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -842,7 +863,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PolicyOverridesUser) {
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest,
PRE_UserDoesNotOverridePolicy) {
- RegisterUser(kEnterpriseUser1);
+ RegisterUser(enterprise_account_id_.GetUserEmail());
chromeos::StartupUtils::MarkOobeCompleted();
}
@@ -851,10 +872,10 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest,
// from overriding the previously chosen image.
IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
const user_manager::User* user =
- user_manager::UserManager::Get()->FindUser(kEnterpriseUser1);
+ user_manager::UserManager::Get()->FindUser(enterprise_account_id_);
ASSERT_TRUE(user);
- LoginUser(kEnterpriseUser1);
+ LoginUser(enterprise_account_id_.GetUserEmail());
base::RunLoop().RunUntilIdle();
policy::CloudPolicyStore* store = GetStoreForUser(user);
@@ -865,8 +886,8 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
user_policy_.payload().mutable_useravatarimage()->set_value(
ConstructPolicy(test::kUserAvatarImage2RelativePath));
user_policy_.Build();
- fake_session_manager_client_->set_user_policy(kEnterpriseUser1,
- user_policy_.GetBlob());
+ fake_session_manager_client_->set_user_policy(
+ enterprise_account_id_.GetUserEmail(), user_policy_.GetBlob());
run_loop_.reset(new base::RunLoop);
store->Load();
run_loop_->Run();
@@ -874,12 +895,12 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1,
+ ExpectNewUserImageInfo(enterprise_account_id_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kEnterpriseUser1, "jpg"));
+ GetUserImagePath(enterprise_account_id_, "jpg"));
scoped_ptr<gfx::ImageSkia> saved_image =
- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
@@ -889,19 +910,19 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, UserDoesNotOverridePolicy) {
// Choose a different user image. Verify that the user image does not change
// as policy takes precedence.
UserImageManager* user_image_manager =
- ChromeUserManager::Get()->GetUserImageManager(kEnterpriseUser1);
+ ChromeUserManager::Get()->GetUserImageManager(enterprise_account_id_);
user_image_manager->SaveUserDefaultImageIndex(
user_manager::kFirstDefaultImageIndex);
EXPECT_FALSE(user->HasDefaultImage());
EXPECT_EQ(user_manager::User::USER_IMAGE_EXTERNAL, user->image_index());
EXPECT_TRUE(test::AreImagesEqual(*policy_image_, user->GetImage()));
- ExpectNewUserImageInfo(kEnterpriseUser1,
+ ExpectNewUserImageInfo(enterprise_account_id_,
user_manager::User::USER_IMAGE_EXTERNAL,
- GetUserImagePath(kEnterpriseUser1, "jpg"));
+ GetUserImagePath(enterprise_account_id_, "jpg"));
saved_image =
- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();
+ test::ImageLoader(GetUserImagePath(enterprise_account_id_, "jpg")).Load();
ASSERT_TRUE(saved_image);
// Check image dimensions. Images can't be compared since JPEG is lossy.
« ash/test/test_session_state_delegate.cc ('K') | « chrome/browser/chromeos/login/user_flow.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698