This CL replaces e-mail with AccountId in wallpaper manager code.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_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 <string>
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/desktop_background/desktop_background_controller_observer.h"
 #include "ash/shell.h"
@@ skipping 116 matching lines @@
 }  // namespace
 
 class WallpaperManagerPolicyTest
     : public LoginManagerTest,
       public ash::DesktopBackgroundControllerObserver {
  protected:
   WallpaperManagerPolicyTest()
       : LoginManagerTest(true),
         wallpaper_change_count_(0),
         fake_session_manager_client_(new FakeSessionManagerClient) {
-    testUsers_[0] = LoginManagerTest::kEnterpriseUser1;
-    testUsers_[1] = LoginManagerTest::kEnterpriseUser2;
+    testUsers_.push_back(
+        AccountId::FromUserEmail(LoginManagerTest::kEnterpriseUser1));
+    testUsers_.push_back(
+        AccountId::FromUserEmail(LoginManagerTest::kEnterpriseUser2));
   }
 
   scoped_ptr<policy::UserPolicyBuilder> GetUserPolicyBuilder(
-      const std::string& user_id) {
+      const AccountId& account_id) {
     scoped_ptr<policy::UserPolicyBuilder>
         user_policy_builder(new policy::UserPolicyBuilder());
     base::FilePath user_keys_dir;
     EXPECT_TRUE(PathService::Get(DIR_USER_POLICY_KEYS, &user_keys_dir));
     const std::string sanitized_user_id =
-        CryptohomeClient::GetStubSanitizedUsername(user_id);
+        CryptohomeClient::GetStubSanitizedUsername(account_id.GetUserEmail());
     const base::FilePath user_key_file =
         user_keys_dir.AppendASCII(sanitized_user_id)
                      .AppendASCII("policy.pub");
     std::vector<uint8> user_key_bits;
     EXPECT_TRUE(user_policy_builder->GetSigningKey()->
                 ExportPublicKey(&user_key_bits));
     EXPECT_TRUE(base::CreateDirectory(user_key_file.DirName()));
     EXPECT_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_builder->policy_data().set_username(user_id);
+    user_policy_builder->policy_data().set_username(account_id.GetUserEmail());
     return user_policy_builder.Pass();
   }
 
   // LoginManagerTest:
   void SetUpInProcessBrowserTestFixture() override {
     DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
 
     LoginManagerTest::SetUpInProcessBrowserTestFixture();
     ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_));
@@ skipping 54 matching lines @@
                                     .spec(),
                                 image_data),
                             &policy);
     return policy;
   }
 
   // Inject |filename| as wallpaper policy for test user |user_number|.  Set
   // empty |filename| to clear policy.
   void InjectPolicy(int user_number, const std::string& filename) {
     ASSERT_TRUE(user_number == 0 || user_number == 1);
-    const std::string user_id = testUsers_[user_number];
+    const AccountId& account_id = testUsers_[user_number];
     policy::UserPolicyBuilder* builder =
         user_policy_builders_[user_number].get();
     if (!filename.empty()) {
       builder->payload().
           mutable_wallpaperimage()->set_value(ConstructPolicy(filename));
     } else {
       builder->payload().Clear();
     }
     builder->Build();
-    fake_session_manager_client_->set_user_policy(user_id, builder->GetBlob());
-    const user_manager::User* user = user_manager::UserManager::Get()->FindUser(
-        AccountId::FromUserEmail(user_id));
+    fake_session_manager_client_->set_user_policy(account_id.GetUserEmail(),
+                                                  builder->GetBlob());
+    const user_manager::User* user =
+        user_manager::UserManager::Get()->FindUser(account_id);
     ASSERT_TRUE(user);
     policy::CloudPolicyStore* store = GetStoreForUser(user);
     ASSERT_TRUE(store);
     store->Load();
     ASSERT_EQ(policy::CloudPolicyStore::STATUS_OK, store->status());
     ASSERT_EQ(policy::CloudPolicyValidatorBase::VALIDATION_OK,
               store->validation_status());
   }
 
   // Obtain WallpaperInfo for |user_number| from WallpaperManager.
   void GetUserWallpaperInfo(int user_number,
                             wallpaper::WallpaperInfo* wallpaper_info) {
     WallpaperManager::Get()->GetUserWallpaperInfo(testUsers_[user_number],
                                                   wallpaper_info);
   }
 
   base::FilePath test_data_dir_;
   scoped_ptr<base::RunLoop> run_loop_;
   int wallpaper_change_count_;
   scoped_ptr<policy::UserPolicyBuilder> user_policy_builders_[2];
   FakeSessionManagerClient* fake_session_manager_client_;
-  const char* testUsers_[2];
+  std::vector<AccountId> testUsers_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WallpaperManagerPolicyTest);
 };
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_SetResetClear) {
-  RegisterUser(testUsers_[0]);
-  RegisterUser(testUsers_[1]);
+  RegisterUser(testUsers_[0].GetUserEmail());
+  RegisterUser(testUsers_[1].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 // Verifies that the wallpaper can be set and re-set through policy and that
 // setting policy for a user that is not logged in doesn't affect the current
 // user.  Also verifies that after the policy has been cleared, the wallpaper
 // reverts to default.
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, SetResetClear) {
   wallpaper::WallpaperInfo info;
-  LoginUser(testUsers_[0]);
+  LoginUser(testUsers_[0].GetUserEmail());
   base::RunLoop().RunUntilIdle();
 
   // First user: Wait until default wallpaper has been loaded (happens
   // automatically) and store color to recognize it later.
   RunUntilWallpaperChangeCount(1);
   const SkColor original_background_color = GetAverageBackgroundColor();
 
   // Second user: Set wallpaper policy to blue image.  This should not result in
   // a wallpaper change, which is checked at the very end of this test.
   InjectPolicy(1, kBlueImageFileName);
@@ skipping 20 matching lines @@
   ASSERT_EQ(user_manager::User::DEFAULT, info.type);
   ASSERT_EQ(original_background_color, GetAverageBackgroundColor());
 
   // Check wallpaper change count to ensure that setting the second user's
   // wallpaper didn't have any effect.
   ASSERT_EQ(4, wallpaper_change_count_);
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_PRE_PRE_WallpaperOnLoginScreen) {
-  RegisterUser(testUsers_[0]);
-  RegisterUser(testUsers_[1]);
+  RegisterUser(testUsers_[0].GetUserEmail());
+  RegisterUser(testUsers_[1].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_PRE_WallpaperOnLoginScreen) {
-  LoginUser(testUsers_[0]);
+  LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest,
                        DISABLED_PRE_WallpaperOnLoginScreen) {
-  LoginUser(testUsers_[1]);
+  LoginUser(testUsers_[1].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to green image.
   InjectPolicy(1, kGreenImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
@@ skipping 10 matching lines @@
   ASSERT_TRUE(content::ExecuteScript(
       static_cast<chromeos::LoginDisplayHostImpl*>(
           chromeos::LoginDisplayHostImpl::default_host())->GetOobeUI()->
               web_ui()->GetWebContents(),
       "document.getElementsByClassName('pod')[1].focus();"));
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PRE_PersistOverLogout) {
-  RegisterUser(testUsers_[0]);
+  RegisterUser(testUsers_[0].GetUserEmail());
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PRE_PersistOverLogout) {
-  LoginUser(testUsers_[0]);
+  LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until default wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
 
   // Set wallpaper policy to red image.
   InjectPolicy(0, kRedImageFileName);
 
   // Run until wallpaper has changed.
   RunUntilWallpaperChangeCount(2);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, PersistOverLogout) {
-  LoginUser(testUsers_[0]);
+  LoginUser(testUsers_[0].GetUserEmail());
 
   // Wait until wallpaper has been loaded.
   RunUntilWallpaperChangeCount(1);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 }
 
 }  // namespace chromeos