This CL replaces user_manager::UserID with AccountId.

chrome/browser/chromeos/login/users/user_manager_unittest.cc

Index: chrome/browser/chromeos/login/users/user_manager_unittest.cc
diff --git a/chrome/browser/chromeos/login/users/user_manager_unittest.cc b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
index b2e6368ece6f74a8757f46e6ac2a702deecf8607..cc8eba7ca3809cf2ea5874a7f380fb88f3aaa338 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -47,6 +47,15 @@ class UnittestProfileManager : public ::ProfileManagerWithoutInit {
 };
 
 class UserManagerTest : public testing::Test {
+ public:
+  UserManagerTest()
+      : owner_at_invalid_domain_(

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

in class member initialization

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

Done.

+            AccountId::FromUserEmail("owner@invalid.domain")),
+        user0_at_invalid_domain_(
+            AccountId::FromUserEmail("user0@invalid.domain")),
+        user1_at_invalid_domain_(
+            AccountId::FromUserEmail("user1@invalid.domain")) {}
+
  protected:
   void SetUp() override {
     base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
@@ -99,12 +108,12 @@ class UserManagerTest : public testing::Test {
     GetChromeUserManager()->SetEphemeralUsersEnabled(ephemeral_users_enabled);
   }
 
-  const std::string& GetUserManagerOwnerEmail() const {
-    return GetChromeUserManager()->GetOwnerEmail();
+  const AccountId GetUserManagerOwnerId() const {

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

Don't need const return type

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

Done.

+    return GetChromeUserManager()->GetOwnerId();
   }
 
-  void SetUserManagerOwnerEmail(const std::string& owner_email) {
-    GetChromeUserManager()->SetOwnerEmail(owner_email);
+  void SetUserManagerOwnerId(const AccountId& owner_id) {

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

owner_account_id

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

Done.

+    GetChromeUserManager()->SetOwnerId(owner_id);
   }
 
   void ResetUserManager() {
@@ -133,6 +142,10 @@ class UserManagerTest : public testing::Test {
     GetChromeUserManager()->RetrieveTrustedDevicePolicies();
   }
 
+  const AccountId owner_at_invalid_domain_;
+  const AccountId user0_at_invalid_domain_;
+  const AccountId user1_at_invalid_domain_;
+
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ -145,56 +158,56 @@ class UserManagerTest : public testing::Test {
 
 TEST_F(UserManagerTest, RetrieveTrustedDevicePolicies) {
   SetUserManagerEphemeralUsersEnabled(true);
-  SetUserManagerOwnerEmail("");
+  SetUserManagerOwnerId(EmptyAccountId());
 
-  SetDeviceSettings(false, "owner@invalid.domain", false);
+  SetDeviceSettings(false, owner_at_invalid_domain_.GetUserEmail(), false);
   RetrieveTrustedDevicePolicies();
 
   EXPECT_FALSE(GetUserManagerEphemeralUsersEnabled());
-  EXPECT_EQ(GetUserManagerOwnerEmail(), "owner@invalid.domain");
+  EXPECT_EQ(GetUserManagerOwnerId(), owner_at_invalid_domain_);
 }
 
 TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
   user_manager::UserManager::Get()->UserLoggedIn(
-      "owner@invalid.domain", "owner@invalid.domain", false);
+      owner_at_invalid_domain_, owner_at_invalid_domain_.GetUserEmail(), false);
   ResetUserManager();
   user_manager::UserManager::Get()->UserLoggedIn(
-      "user0@invalid.domain", "owner@invalid.domain", false);
+      user0_at_invalid_domain_, owner_at_invalid_domain_.GetUserEmail(), false);
   ResetUserManager();
   user_manager::UserManager::Get()->UserLoggedIn(
-      "user1@invalid.domain", "owner@invalid.domain", false);
+      user1_at_invalid_domain_, owner_at_invalid_domain_.GetUserEmail(), false);
   ResetUserManager();
 
   const user_manager::UserList* users =
       &user_manager::UserManager::Get()->GetUsers();
   ASSERT_EQ(3U, users->size());
-  EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain");
-  EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain");
-  EXPECT_EQ((*users)[2]->email(), "owner@invalid.domain");
+  EXPECT_EQ((*users)[0]->GetUserID(), user1_at_invalid_domain_);
+  EXPECT_EQ((*users)[1]->GetUserID(), user0_at_invalid_domain_);
+  EXPECT_EQ((*users)[2]->GetUserID(), owner_at_invalid_domain_);
 
-  SetDeviceSettings(true, "owner@invalid.domain", false);
+  SetDeviceSettings(true, owner_at_invalid_domain_.GetUserEmail(), false);
   RetrieveTrustedDevicePolicies();
 
   users = &user_manager::UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
-  EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
+  EXPECT_EQ((*users)[0]->GetUserID(), owner_at_invalid_domain_);
 }
 
 TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) {
-  SetDeviceSettings(true, "owner@invalid.domain", false);
+  SetDeviceSettings(true, owner_at_invalid_domain_.GetUserEmail(), false);
   RetrieveTrustedDevicePolicies();
 
   user_manager::UserManager::Get()->UserLoggedIn(
-      "owner@invalid.domain", "user0@invalid.domain", false);
+      owner_at_invalid_domain_, user0_at_invalid_domain_.GetUserEmail(), false);
   ResetUserManager();
   user_manager::UserManager::Get()->UserLoggedIn(
-      "user0@invalid.domain", "user0@invalid.domain", false);
+      user0_at_invalid_domain_, user0_at_invalid_domain_.GetUserEmail(), false);
   ResetUserManager();
 
   const user_manager::UserList* users =
       &user_manager::UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
-  EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
+  EXPECT_EQ((*users)[0]->GetUserID(), owner_at_invalid_domain_);
 }
 
 }  // namespace chromeos