chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc - Issue 1412813003: This CL replaces user_manager::UserID with AccountId.

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: Rebased. 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

« chrome/browser/chromeos/login/signin/token_handle_util.cc ('K') | « chrome/browser/chromeos/login/user_flow.cc ('k') | chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.cc » ('j') | chrome/browser/chromeos/login/users/chrome_user_manager_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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..d4a9b36e07ef00c0d14b0ca3f194b714e1881f89 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,10 @@ policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {

class UserImageManagerTest : public LoginManagerTest,

public user_manager::UserManager::Observer {

protected:

- UserImageManagerTest() : LoginManagerTest(true) {

- }

+ UserImageManagerTest()

+ : LoginManagerTest(true),

+ test_account_id_(AccountId::FromUserEmail(kTestUser1)),

achuithb 2015/10/23 00:08:50 in class member initialization

Alexander Alekseev 2015/10/23 09:11:22 Done.

+ enterprise_account_id_(AccountId::FromUserEmail(kEnterpriseUser1)) {}

// LoginManagerTest overrides:

void SetUpInProcessBrowserTestFixture() override {

@@ -131,9 +133,10 @@ 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.

@@ -239,16 +242,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 +293,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->GetUserID()));

if (uim->job_.get()) {

run_loop_.reset(new base::RunLoop);

run_loop_->Run();

@@ -306,6 +309,9 @@ class UserImageManagerTest : public LoginManagerTest,

scoped_ptr<base::RunLoop> run_loop_;

+ const AccountId test_account_id_;

+ const AccountId enterprise_account_id_;

private:

DISALLOW_COPY_AND_ASSIGN(UserImageManagerTest);

};

@@ -313,26 +319,28 @@ 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_id_.GetUserEmail(),

+ 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_id_.GetUserEmail(),

+ user_manager::kFirstDefaultImageIndex,

+ base::FilePath());

+ LogIn(test_account_id_);

// Image info is migrated now.

- ExpectNewUserImageInfo(

- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());

+ ExpectNewUserImageInfo(test_account_id_.GetUserEmail(),

+ 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(test_account_id_.GetUserEmail(),

+ user_manager::kFirstDefaultImageIndex, base::FilePath());

SetOldUserImageInfo(

kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());

}

@@ -340,14 +348,16 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_OtherUsersUnaffected) {

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(test_account_id_.GetUserEmail(),

+ user_manager::kFirstDefaultImageIndex,

+ base::FilePath());

ExpectOldUserImageInfo(

kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());

- LogIn(kTestUser1);

+ LogIn(test_account_id_);

// Image info is migrated for the first user and unaffected for the rest.

- ExpectNewUserImageInfo(

- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());

+ ExpectNewUserImageInfo(test_account_id_.GetUserEmail(),

+ user_manager::kFirstDefaultImageIndex,

+ base::FilePath());

ExpectOldUserImageInfo(

kTestUser2, user_manager::kFirstDefaultImageIndex + 1, base::FilePath());

}

@@ -355,7 +365,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, OtherUsersUnaffected) {

IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_PRE_NonJPEGImageFromFile) {

// Setup a user with non-JPEG image.

ScopedUserManagerEnabler(new MockUserManager);

- SaveUserImagePNG(kTestUser1,

+ SaveUserImagePNG(test_account_id_.GetUserEmail(),

user_manager::kDefaultImageResourceIDs

[user_manager::kFirstDefaultImageIndex]);

}

@@ -363,26 +373,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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kTestUser1, "png"));

+ ExpectOldUserImageInfo(

+ test_account_id_.GetUserEmail(), user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(test_account_id_.GetUserEmail(), "png"));

const user_manager::User* user =

- user_manager::UserManager::Get()->FindUser(kTestUser1);

+ user_manager::UserManager::Get()->FindUser(test_account_id_);

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_id_);

// Wait for migration.

run_loop.Run();

// Image info is migrated and the image is converted to JPG.

- ExpectNewUserImageInfo(kTestUser1,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kTestUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ test_account_id_.GetUserEmail(), user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"));

user = user_manager::UserManager::Get()->GetLoggedInUser();

ASSERT_TRUE(user);

EXPECT_FALSE(user->image_is_safe_format());

@@ -396,7 +406,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_id_);

ASSERT_TRUE(user);

// Wait for image load.

if (user->image_index() == user_manager::User::USER_IMAGE_INVALID) {

@@ -414,40 +424,41 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, NonJPEGImageFromFile) {

}

IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserDefaultImageIndex) {

- RegisterUser(kTestUser1);

+ RegisterUser(test_account_id_.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_id_);

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_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(

- kTestUser1, user_manager::kFirstDefaultImageIndex, base::FilePath());

+ ExpectNewUserImageInfo(test_account_id_.GetUserEmail(),

+ user_manager::kFirstDefaultImageIndex,

+ base::FilePath());

}

IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImage) {

- RegisterUser(kTestUser1);

+ RegisterUser(test_account_id_.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_id_);

ASSERT_TRUE(user);

SkBitmap custom_image_bitmap;

@@ -459,7 +470,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_id_);

user_image_manager->SaveUserImage(

user_manager::UserImage::CreateAndEncode(custom_image));

run_loop_->Run();

@@ -467,12 +478,14 @@ 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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kTestUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ test_account_id_.GetUserEmail(), user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"));

const scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.

@@ -481,14 +494,14 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImage) {

}

IN_PROC_BROWSER_TEST_F(UserImageManagerTest, PRE_SaveUserImageFromFile) {

- RegisterUser(kTestUser1);

+ RegisterUser(test_account_id_.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_id_);

ASSERT_TRUE(user);

const base::FilePath custom_image_path =

@@ -499,19 +512,21 @@ 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_id_);

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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kTestUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ test_account_id_.GetUserEmail(), user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"));

const scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.

@@ -521,7 +536,7 @@ IN_PROC_BROWSER_TEST_F(UserImageManagerTest, SaveUserImageFromFile) {

IN_PROC_BROWSER_TEST_F(UserImageManagerTest,

PRE_SaveUserImageFromProfileImage) {

- RegisterUser(kTestUser1);

+ RegisterUser(test_account_id_.GetUserEmail());

chromeos::StartupUtils::MarkOobeCompleted();

}

@@ -529,22 +544,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_id_);

ASSERT_TRUE(user);

UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();

- LoginUser(kTestUser1);

+ LoginUser(test_account_id_.GetUserEmail());

Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);

- SeedAccountTrackerService(kTestUser1, profile);

+ SeedAccountTrackerService(test_account_id_.GetUserEmail(), profile);

run_loop_.reset(new base::RunLoop);

UserImageManager* user_image_manager =

- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);

+ ChromeUserManager::Get()->GetUserImageManager(test_account_id_);

user_image_manager->SaveUserImageFromProfileImage();

run_loop_->Run();

net::TestURLFetcherFactory url_fetcher_factory;

- CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);

+ CompleteProfileMetadataDownload(test_account_id_, &url_fetcher_factory);

CompleteProfileImageDownload(&url_fetcher_factory);

const gfx::ImageSkia& profile_image =

@@ -553,12 +568,14 @@ 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,

- user_manager::User::USER_IMAGE_PROFILE,

- GetUserImagePath(kTestUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ test_account_id_.GetUserEmail(), user_manager::User::USER_IMAGE_PROFILE,

+ GetUserImagePath(test_account_id_.GetUserEmail(), "jpg"));

const scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kTestUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(test_account_id_.GetUserEmail(), "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_id_.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_id_);

ASSERT_TRUE(user);

const gfx::ImageSkia& default_image =

user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);

UserImageManagerImpl::IgnoreProfileDataDownloadDelayForTesting();

- LoginUser(kTestUser1);

+ LoginUser(test_account_id_.GetUserEmail());

Profile* profile = ProfileHelper::Get()->GetProfileByUserUnsafe(user);

- SeedAccountTrackerService(kTestUser1, profile);

+ SeedAccountTrackerService(test_account_id_.GetUserEmail(), profile);

run_loop_.reset(new base::RunLoop);

UserImageManager* user_image_manager =

- ChromeUserManager::Get()->GetUserImageManager(kTestUser1);

+ ChromeUserManager::Get()->GetUserImageManager(test_account_id_);

user_image_manager->SaveUserImageFromProfileImage();

run_loop_->Run();

net::TestURLFetcherFactory url_fetcher_factory;

- CompleteProfileMetadataDownload(kTestUser1, &url_fetcher_factory);

+ CompleteProfileMetadataDownload(test_account_id_, &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_id_.GetUserEmail(),

+ 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,15 @@ 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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kEnterpriseUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ enterprise_account_id_.GetUserEmail(),

+ user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"));

scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.

@@ -737,8 +760,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,8 +778,8 @@ 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,

- base::FilePath());

+ ExpectNewUserImageInfo(enterprise_account_id_.GetUserEmail(),

+ default_image_index, base::FilePath());

// Choose a different user image. Verify that the chosen user image is set and

// persisted.

@@ -768,17 +791,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_.GetUserEmail(),

+ 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 +811,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 +826,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_.GetUserEmail(),

user_manager::kFirstDefaultImageIndex,

base::FilePath());

@@ -818,8 +842,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 +851,15 @@ 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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kEnterpriseUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ enterprise_account_id_.GetUserEmail(),

+ user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"));

scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.

@@ -842,7 +869,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 +878,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 +892,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 +901,15 @@ 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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kEnterpriseUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ enterprise_account_id_.GetUserEmail(),

+ user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"));

scoped_ptr<gfx::ImageSkia> saved_image =

- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.

@@ -889,19 +919,22 @@ 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,

- user_manager::User::USER_IMAGE_EXTERNAL,

- GetUserImagePath(kEnterpriseUser1, "jpg"));

+ ExpectNewUserImageInfo(

+ enterprise_account_id_.GetUserEmail(),

+ user_manager::User::USER_IMAGE_EXTERNAL,

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"));

saved_image =

- test::ImageLoader(GetUserImagePath(kEnterpriseUser1, "jpg")).Load();

+ test::ImageLoader(

+ GetUserImagePath(enterprise_account_id_.GetUserEmail(), "jpg"))

+ .Load();

ASSERT_TRUE(saved_image);

// Check image dimensions. Images can't be compared since JPEG is lossy.