This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/users/avatar/user_image_manager_browsertest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 85 matching lines @@
     return NULL;
   }
   return policy_manager->core()->store();
 }
 
 }  // namespace
 
 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 {
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
 
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
     ASSERT_TRUE(PathService::Get(chrome::DIR_USER_DATA, &user_data_dir_));
   }
 
   void SetUpOnMainThread() override {
     LoginManagerTest::SetUpOnMainThread();
     local_state_ = g_browser_process->local_state();
     user_manager::UserManager::Get()->AddObserver(this);
   }
 
   void TearDownOnMainThread() override {
     user_manager::UserManager::Get()->RemoveObserver(this);
     LoginManagerTest::TearDownOnMainThread();
   }
 
   // UserManager::Observer overrides:
   void LocalStateChanged(user_manager::UserManager* user_manager) override {
     if (run_loop_)
       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,
                            int image_index,
                            const base::FilePath& image_path) {
     RegisterUser(username);
     DictionaryPrefUpdate images_pref(local_state_, "UserImages");
     base::DictionaryValue* image_properties = new base::DictionaryValue();
     image_properties->Set("index", new base::FundamentalValue(image_index));
@@ skipping 35 matching lines @@
                               int image_index,
                               const base::FilePath& image_path) {
     ExpectUserImageInfo(local_state_->GetDictionary("UserImages"),
                         username, image_index, image_path);
     ExpectNoUserImageInfo(local_state_->GetDictionary("user_image_info"),
                           username);
   }
 
   // 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,

[achuithb, 2015/10/23 00:08:50]

Why not change this and related methods to take const AccountId& instead?

[Alexander Alekseev, 2015/10/23 09:11:22]

Done.

                               int image_index,
                               const base::FilePath& image_path) {
     ExpectUserImageInfo(local_state_->GetDictionary("user_image_info"),
                         username, image_index, image_path);
     ExpectNoUserImageInfo(local_state_->GetDictionary("UserImages"),
                           username);
   }
 
   // Sets bitmap |resource_id| as image for |username| and saves it to disk.
   void SaveUserImagePNG(const std::string& username,
@@ skipping 29 matching lines @@
     info.given_name = username;
     info.hosted_domain = std::string();
     info.locale = username;
     info.picture_url = "http://localhost/avatar.jpg";
     info.is_child_account = false;
 
     AccountTrackerServiceFactory::GetForProfile(profile)->SeedAccountInfo(info);
   }
 
   // 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);
 
     static_cast<OAuth2TokenService::Consumer*>(profile_downloader)->
         OnGetTokenSuccess(NULL,
                           std::string(),
                           base::Time::Now() + base::TimeDelta::FromDays(1));
   }
 
   // Completes the download of the currently logged-in user's profile image.
@@ skipping 21 matching lines @@
     fetcher->set_status(net::URLRequestStatus(net::URLRequestStatus::SUCCESS,
                                               net::OK));
     fetcher->set_response_code(200);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
     run_loop.Run();
 
     const user_manager::User* user =
         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();
     }
   }
 
   base::FilePath test_data_dir_;
   base::FilePath user_data_dir_;
 
   PrefService* local_state_;
 
   scoped_ptr<gfx::ImageSkia> decoded_image_;
 
   scoped_ptr<base::RunLoop> run_loop_;
 
+  const AccountId test_account_id_;
+  const AccountId enterprise_account_id_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(UserImageManagerTest);
 };
 
 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());
 }
 
 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());
 }
 
 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]);
 }
 
 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());
   // Check image dimensions.
   const gfx::ImageSkia& saved_image =
       user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
   EXPECT_EQ(saved_image.width(), user->GetImage().width());
   EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
 
 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) {
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
         content::NotificationService::AllSources()).Wait();
   }
   // Now the migrated image is used.
   EXPECT_TRUE(user->image_is_safe_format());
   // Check image dimensions. Images can't be compared since JPEG is lossy.
   const gfx::ImageSkia& saved_image =
       user_manager::GetDefaultImage(user_manager::kFirstDefaultImageIndex);
   EXPECT_EQ(saved_image.width(), user->GetImage().width());
   EXPECT_EQ(saved_image.height(), user->GetImage().height());
 }
 
 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;
   custom_image_bitmap.allocN32Pixels(10, 10);
   custom_image_bitmap.eraseColor(SK_ColorWHITE);
   custom_image_bitmap.setImmutable();
   const gfx::ImageSkia custom_image =
       gfx::ImageSkia::CreateFrom1xBitmap(custom_image_bitmap);
 
   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();
 
   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.
   EXPECT_EQ(custom_image.width(), saved_image->width());
   EXPECT_EQ(custom_image.height(), saved_image->height());
 }
 
 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 =
       test_data_dir_.Append(test::kUserAvatarImage1RelativePath);
   const scoped_ptr<gfx::ImageSkia> custom_image =
       test::ImageLoader(custom_image_path).Load();
   ASSERT_TRUE(custom_image);
 
   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.
   EXPECT_EQ(custom_image->width(), saved_image->width());
   EXPECT_EQ(custom_image->height(), saved_image->height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
                        PRE_SaveUserImageFromProfileImage) {
-  RegisterUser(kTestUser1);
+  RegisterUser(test_account_id_.GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that SaveUserImageFromProfileImage() correctly downloads, sets and
 // 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 =
       user_image_manager->DownloadedProfileImage();
 
   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.
   EXPECT_EQ(profile_image.width(), saved_image->width());
   EXPECT_EQ(profile_image.height(), saved_image->height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerTest,
                        PRE_ProfileImageDownloadDoesNotClobber) {
-  RegisterUser(kTestUser1);
+  RegisterUser(test_account_id_.GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 // Sets the user image to the profile image, then sets it to one of the default
 // images while the profile image download is still in progress. Verifies that
 // when the download completes, the profile image is ignored and does not
 // clobber the default image chosen in the meantime.
 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);
 
   CompleteProfileImageDownload(&url_fetcher_factory);
 
   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,
                                    public policy::CloudPolicyStore::Observer {
  protected:
   UserImageManagerPolicyTest()
       : fake_session_manager_client_(new chromeos::FakeSessionManagerClient) {
   }
 
   // UserImageManagerTest overrides:
   void SetUpInProcessBrowserTestFixture() override {
     DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
     UserImageManagerTest::SetUpInProcessBrowserTestFixture();
   }
 
   void SetUpOnMainThread() override {
     UserImageManagerTest::SetUpOnMainThread();
 
     base::FilePath user_keys_dir;
     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");
     std::vector<uint8> user_key_bits;
     ASSERT_TRUE(user_policy_.GetSigningKey()->ExportPublicKey(&user_key_bits));
     ASSERT_TRUE(base::CreateDirectory(user_key_file.DirName()));
     ASSERT_EQ(base::WriteFile(
                   user_key_file,
                   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();
     ASSERT_TRUE(policy_image_);
   }
 
   // policy::CloudPolicyStore::Observer overrides:
   void OnStoreLoaded(policy::CloudPolicyStore* store) override {
     if (run_loop_)
       run_loop_->Quit();
@@ skipping 23 matching lines @@
   policy::UserPolicyBuilder user_policy_;
   FakeSessionManagerClient* fake_session_manager_client_;
 
   scoped_ptr<gfx::ImageSkia> policy_image_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(UserImageManagerPolicyTest);
 };
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest, PRE_SetAndClear) {
-  RegisterUser(kEnterpriseUser1);
+  RegisterUser(enterprise_account_id_.GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that the user image can be set through policy. Also verifies that
 // after the policy has been cleared, the user is able to choose a different
 // image.
 // 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);
   ASSERT_TRUE(store);
 
   // Set policy. Verify that the policy-provided user image is downloaded, set
   // and persisted.
   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();
 
   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.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 
   // Clear policy. Verify that the user image switches to a random default
   // 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();
   run_loop_->Run();
   store->RemoveObserver(this);
   base::RunLoop().RunUntilIdle();
 
   const int default_image_index = user->image_index();
   EXPECT_TRUE(user->HasDefaultImage());
   ASSERT_LE(user_manager::kFirstDefaultImageIndex, default_image_index);
   ASSERT_GT(
       user_manager::kFirstDefaultImageIndex + user_manager::kDefaultImagesCount,
       default_image_index);
   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.
   const int user_image_index =
       user_manager::kFirstDefaultImageIndex +
       (default_image_index - user_manager::kFirstDefaultImageIndex + 1) %
           user_manager::kDefaultImagesCount;
   const gfx::ImageSkia& user_image =
       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();
 }
 
 // Verifies that when the user chooses a user image and a different image is
 // then set through policy, the policy takes precedence, overriding the
 // 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);
   ASSERT_TRUE(store);
 
   // Choose a user image. Verify that the chosen user image is set and
   // persisted.
   const gfx::ImageSkia& default_image =
       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());
 
   // Set policy. Verify that the policy-provided user image is downloaded, set
   // and persisted, overriding the previously set image.
   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();
 
   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.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 }
 
 IN_PROC_BROWSER_TEST_F(UserImageManagerPolicyTest,
                        PRE_UserDoesNotOverridePolicy) {
-  RegisterUser(kEnterpriseUser1);
+  RegisterUser(enterprise_account_id_.GetUserEmail());
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that when the user image has been set through policy and the user
 // chooses a different image, the policy takes precedence, preventing the user
 // 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);
   ASSERT_TRUE(store);
 
   // Set policy. Verify that the policy-provided user image is downloaded, set
   // and persisted.
   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();
 
   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.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 
   // 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.
   EXPECT_EQ(policy_image_->width(), saved_image->width());
   EXPECT_EQ(policy_image_->height(), saved_image->height());
 }
 
 }  // namespace chromeos