Make sure GetAuthenticatedAccountId() returns a canonicalized id.

components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc

Index: components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
diff --git a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
index b76d7494e35cfb86d2eabb78ae0c8dc93414dc30..138a936d3eadf6ab9befdd1b8eb3cb983fd43294 100644
--- a/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
+++ b/components/signin/core/browser/mutable_profile_oauth2_token_service_unittest.cc
@@ -368,3 +368,16 @@ TEST_F(MutableProfileOAuth2TokenServiceTest, FetchTransientError) {
   EXPECT_EQ(GoogleServiceAuthError::AuthErrorNone(),
             oauth2_service_.signin_error_controller()->auth_error());
 }
+
+TEST_F(MutableProfileOAuth2TokenServiceTest, CanonicalizeAccountId) {
+  std::map<std::string, std::string> tokens;
+  tokens["AccountId-user@gmail.com"] = "refresh_token";
+  tokens["AccountId-Foo.Bar@gmail.com"] = "refresh_token";
+  tokens["AccountId-12345"] = "refresh_token";
+
+  oauth2_service_.LoadAllCredentialsIntoMemory(tokens);
+
+  EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("user@gmail.com"));
+  EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("foobar@gmail.com"));
+  EXPECT_TRUE(oauth2_service_.RefreshTokenIsAvailable("12345"));
+}