This CL replaces user_manager::UserID with AccountId.

chrome/browser/metrics/chromeos_metrics_provider_unittest.cc

Index: chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index 19d02b219f7cb9920bdb48040464d599abe40c26..9cbdd3fed3995aab38b9e4cb1138419976c69089 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -115,9 +115,9 @@ class ChromeOSMetricsProviderTest : public testing::Test {
 };
 
 TEST_F(ChromeOSMetricsProviderTest, MultiProfileUserCount) {
-  std::string user1("user1@example.com");
-  std::string user2("user2@example.com");
-  std::string user3("user3@example.com");
+  const AccountId user1(AccountId::FromUserEmail("user1@example.com"));
+  const AccountId user2(AccountId::FromUserEmail("user2@example.com"));
+  const AccountId user3(AccountId::FromUserEmail("user3@example.com"));
 
   // |scoped_enabler| takes over the lifetime of |user_manager|.
   chromeos::FakeChromeUserManager* user_manager =
@@ -138,9 +138,9 @@ TEST_F(ChromeOSMetricsProviderTest, MultiProfileUserCount) {
 }
 
 TEST_F(ChromeOSMetricsProviderTest, MultiProfileCountInvalidated) {
-  std::string user1("user1@example.com");
-  std::string user2("user2@example.com");
-  std::string user3("user3@example.com");
+  const AccountId user1(AccountId::FromUserEmail("user1@example.com"));
+  const AccountId user2(AccountId::FromUserEmail("user2@example.com"));
+  const AccountId user3(AccountId::FromUserEmail("user3@example.com"));
 
   // |scoped_enabler| takes over the lifetime of |user_manager|.
   chromeos::FakeChromeUserManager* user_manager =