Revert of 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 db5a69aa342ad677d9f81d89aac075bd4684b612..b2e6368ece6f74a8757f46e6ac2a702deecf8607 100644
--- a/chrome/browser/chromeos/login/users/user_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/user_manager_unittest.cc
@@ -47,9 +47,6 @@
 };
 
 class UserManagerTest : public testing::Test {
- public:
-  UserManagerTest() {}
-
  protected:
   void SetUp() override {
     base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess();
@@ -102,12 +99,12 @@
     GetChromeUserManager()->SetEphemeralUsersEnabled(ephemeral_users_enabled);
   }
 
-  AccountId GetUserManagerOwnerId() const {
-    return GetChromeUserManager()->GetOwnerAccountId();
-  }
-
-  void SetUserManagerOwnerId(const AccountId& owner_account_id) {
-    GetChromeUserManager()->SetOwnerId(owner_account_id);
+  const std::string& GetUserManagerOwnerEmail() const {
+    return GetChromeUserManager()->GetOwnerEmail();
+  }
+
+  void SetUserManagerOwnerEmail(const std::string& owner_email) {
+    GetChromeUserManager()->SetOwnerEmail(owner_email);
   }
 
   void ResetUserManager() {
@@ -136,13 +133,6 @@
     GetChromeUserManager()->RetrieveTrustedDevicePolicies();
   }
 
-  const AccountId owner_account_id_at_invalid_domain_ =
-      AccountId::FromUserEmail("owner@invalid.domain");
-  const AccountId account_id0_at_invalid_domain_ =
-      AccountId::FromUserEmail("user0@invalid.domain");
-  const AccountId account_id1_at_invalid_domain_ =
-      AccountId::FromUserEmail("user1@invalid.domain");
-
  protected:
   content::TestBrowserThreadBundle thread_bundle_;
 
@@ -155,64 +145,56 @@
 
 TEST_F(UserManagerTest, RetrieveTrustedDevicePolicies) {
   SetUserManagerEphemeralUsersEnabled(true);
-  SetUserManagerOwnerId(EmptyAccountId());
-
-  SetDeviceSettings(false, owner_account_id_at_invalid_domain_.GetUserEmail(),
-                    false);
+  SetUserManagerOwnerEmail("");
+
+  SetDeviceSettings(false, "owner@invalid.domain", false);
   RetrieveTrustedDevicePolicies();
 
   EXPECT_FALSE(GetUserManagerEphemeralUsersEnabled());
-  EXPECT_EQ(GetUserManagerOwnerId(), owner_account_id_at_invalid_domain_);
+  EXPECT_EQ(GetUserManagerOwnerEmail(), "owner@invalid.domain");
 }
 
 TEST_F(UserManagerTest, RemoveAllExceptOwnerFromList) {
   user_manager::UserManager::Get()->UserLoggedIn(
-      owner_account_id_at_invalid_domain_,
-      owner_account_id_at_invalid_domain_.GetUserEmail(), false);
-  ResetUserManager();
-  user_manager::UserManager::Get()->UserLoggedIn(
-      account_id0_at_invalid_domain_,
-      owner_account_id_at_invalid_domain_.GetUserEmail(), false);
-  ResetUserManager();
-  user_manager::UserManager::Get()->UserLoggedIn(
-      account_id1_at_invalid_domain_,
-      owner_account_id_at_invalid_domain_.GetUserEmail(), false);
+      "owner@invalid.domain", "owner@invalid.domain", false);
+  ResetUserManager();
+  user_manager::UserManager::Get()->UserLoggedIn(
+      "user0@invalid.domain", "owner@invalid.domain", false);
+  ResetUserManager();
+  user_manager::UserManager::Get()->UserLoggedIn(
+      "user1@invalid.domain", "owner@invalid.domain", false);
   ResetUserManager();
 
   const user_manager::UserList* users =
       &user_manager::UserManager::Get()->GetUsers();
   ASSERT_EQ(3U, users->size());
-  EXPECT_EQ((*users)[0]->GetAccountId(), account_id1_at_invalid_domain_);
-  EXPECT_EQ((*users)[1]->GetAccountId(), account_id0_at_invalid_domain_);
-  EXPECT_EQ((*users)[2]->GetAccountId(), owner_account_id_at_invalid_domain_);
-
-  SetDeviceSettings(true, owner_account_id_at_invalid_domain_.GetUserEmail(),
-                    false);
+  EXPECT_EQ((*users)[0]->email(), "user1@invalid.domain");
+  EXPECT_EQ((*users)[1]->email(), "user0@invalid.domain");
+  EXPECT_EQ((*users)[2]->email(), "owner@invalid.domain");
+
+  SetDeviceSettings(true, "owner@invalid.domain", false);
   RetrieveTrustedDevicePolicies();
 
   users = &user_manager::UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
-  EXPECT_EQ((*users)[0]->GetAccountId(), owner_account_id_at_invalid_domain_);
+  EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 TEST_F(UserManagerTest, RegularUserLoggedInAsEphemeral) {
-  SetDeviceSettings(true, owner_account_id_at_invalid_domain_.GetUserEmail(),
-                    false);
+  SetDeviceSettings(true, "owner@invalid.domain", false);
   RetrieveTrustedDevicePolicies();
 
   user_manager::UserManager::Get()->UserLoggedIn(
-      owner_account_id_at_invalid_domain_,
-      account_id0_at_invalid_domain_.GetUserEmail(), false);
-  ResetUserManager();
-  user_manager::UserManager::Get()->UserLoggedIn(
-      account_id0_at_invalid_domain_,
-      account_id0_at_invalid_domain_.GetUserEmail(), false);
+      "owner@invalid.domain", "user0@invalid.domain", false);
+  ResetUserManager();
+  user_manager::UserManager::Get()->UserLoggedIn(
+      "user0@invalid.domain", "user0@invalid.domain", false);
   ResetUserManager();
 
   const user_manager::UserList* users =
       &user_manager::UserManager::Get()->GetUsers();
   EXPECT_EQ(1U, users->size());
-  EXPECT_EQ((*users)[0]->GetAccountId(), owner_account_id_at_invalid_domain_);
+  EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 }  // namespace chromeos