Add gaia_id to ProfileInfoCache.

chrome/browser/profiles/profile_manager_unittest.cc

Index: chrome/browser/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 76a2126745abd2bea3b17be1b2ea9aab44e08afa..f818f61f8fd7fa3965d6b657c26061a0c9febe05 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -148,7 +148,7 @@ class ProfileManagerTest : public testing::Test {
     size_t num_profiles = cache.GetNumberOfProfiles();
     base::FilePath path = temp_dir_.path().AppendASCII(path_suffix);
     cache.AddProfileToCache(path, profile_name,
-                            base::string16(), 0, std::string());
+                            std::string(), base::string16(), 0, std::string());
     EXPECT_EQ(num_profiles + 1, cache.GetNumberOfProfiles());
     return profile_manager->GetProfile(path);
   }
@@ -476,13 +476,13 @@ TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
 
   EXPECT_EQ(0u, cache.GetNumberOfProfiles());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"),
-                          ASCIIToUTF16("name_1"), base::string16(), 0,
+                          ASCIIToUTF16("name_1"), "12345", base::string16(), 0,
                           std::string());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"),
-                          ASCIIToUTF16("name_2"), base::string16(), 0,
+                          ASCIIToUTF16("name_2"), "23456", base::string16(), 0,
                           std::string());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_3"),
-                          ASCIIToUTF16("name_3"), base::string16(), 0,
+                          ASCIIToUTF16("name_3"), "34567", base::string16(), 0,
                           std::string());
   cache.SetBackgroundStatusOfProfileAtIndex(0, true);
   cache.SetBackgroundStatusOfProfileAtIndex(2, true);
@@ -501,10 +501,10 @@ TEST_F(ProfileManagerTest, DoNotAutoloadProfilesIfBackgroundModeOff) {
 
   EXPECT_EQ(0u, cache.GetNumberOfProfiles());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"),
-                          ASCIIToUTF16("name_1"), base::string16(), 0,
+                          ASCIIToUTF16("name_1"), "12345", base::string16(), 0,
                           std::string());
   cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"),
-                          ASCIIToUTF16("name_2"), base::string16(), 0,
+                          ASCIIToUTF16("name_2"), "23456", base::string16(), 0,
                           std::string());
   cache.SetBackgroundStatusOfProfileAtIndex(0, false);
   cache.SetBackgroundStatusOfProfileAtIndex(1, true);
@@ -1112,14 +1112,14 @@ TEST_F(ProfileManagerTest, ProfileDisplayNamePreservesSignedInName) {
 
   // For a signed in profile with a default name we still display
   // IDS_SINGLE_PROFILE_DISPLAY_NAME.
-  cache.SetUserNameOfProfileAtIndex(0, ASCIIToUTF16("user@gmail.com"));
+  cache.SetAuthInfoOfProfileAtIndex(0, "12345", ASCIIToUTF16("user@gmail.com"));
   EXPECT_EQ(profile_name1, cache.GetNameOfProfileAtIndex(0));
   EXPECT_EQ(default_profile_name,
             profiles::GetAvatarNameForProfile(profile1->GetPath()));
 
   // For a signed in profile with a non-default Gaia given name we display the
   // Gaia given name.
-  cache.SetUserNameOfProfileAtIndex(0, ASCIIToUTF16("user@gmail.com"));
+  cache.SetAuthInfoOfProfileAtIndex(0, "12345", ASCIIToUTF16("user@gmail.com"));
   const base::string16 gaia_given_name(ASCIIToUTF16("given name"));
   cache.SetGAIAGivenNameOfProfileAtIndex(0, gaia_given_name);
   EXPECT_EQ(gaia_given_name, cache.GetNameOfProfileAtIndex(0));
@@ -1173,18 +1173,18 @@ TEST_F(ProfileManagerTest, ProfileDisplayNameIsEmailIfDefaultName) {
   const base::string16 email3(ASCIIToUTF16("user3@gmail.com"));
 
   int index = cache.GetIndexOfProfileWithPath(profile1->GetPath());
-  cache.SetUserNameOfProfileAtIndex(index, email1);
+  cache.SetAuthInfoOfProfileAtIndex(index, "12345", email1);
   cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
   cache.SetGAIANameOfProfileAtIndex(index, base::string16());
 
   // This may resort the cache, so be extra cautious to use the right profile.
   index = cache.GetIndexOfProfileWithPath(profile2->GetPath());
-  cache.SetUserNameOfProfileAtIndex(index, email2);
+  cache.SetAuthInfoOfProfileAtIndex(index, "23456", email2);
   cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
   cache.SetGAIANameOfProfileAtIndex(index, base::string16());
 
   index = cache.GetIndexOfProfileWithPath(profile3->GetPath());
-  cache.SetUserNameOfProfileAtIndex(index, email3);
+  cache.SetAuthInfoOfProfileAtIndex(index, "34567", email3);
   cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
   cache.SetGAIANameOfProfileAtIndex(index, base::string16());
 
@@ -1227,7 +1227,7 @@ TEST_F(ProfileManagerTest, ActiveProfileDeletedNeedsToLoadNextProfile) {
 
   // Track the profile, but don't load it.
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
-  cache.AddProfileToCache(dest_path2, ASCIIToUTF16(profile_name2),
+  cache.AddProfileToCache(dest_path2, ASCIIToUTF16(profile_name2), "23456",
                           base::string16(), 0, std::string());
   base::RunLoop().RunUntilIdle();
 
@@ -1278,9 +1278,11 @@ TEST_F(ProfileManagerTest, ActiveProfileDeletedNextProfileDeletedToo) {
   // and not randomly by the avatar name.
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   cache.AddProfileToCache(dest_path2, ASCIIToUTF16(profile_name2),
-                          ASCIIToUTF16(profile_name2), 1, std::string());
+                          "23456", ASCIIToUTF16(profile_name2), 1,
+                          std::string());
   cache.AddProfileToCache(dest_path3, ASCIIToUTF16(profile_name3),
-                          ASCIIToUTF16(profile_name3), 2, std::string());
+                          "34567", ASCIIToUTF16(profile_name3), 2,
+                          std::string());
 
   base::RunLoop().RunUntilIdle();