Add gaia_id to ProfileInfoCache.

chrome/browser/profiles/profile_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
@@ skipping 130 matching lines @@
 
   // Helper function to add a profile with |profile_name| to
   // |profile_manager|'s ProfileInfoCache, and return the profile created.
   Profile* AddProfileToCache(ProfileManager* profile_manager,
                              const std::string& path_suffix,
                              const base::string16& profile_name) {
     ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
     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);
   }
 
 #if defined(OS_CHROMEOS)
   // Helper function to register an user with id |user_id| and create profile
   // with a correct path.
   void RegisterUser(const std::string& user_id) {
     chromeos::ProfileHelper* profile_helper = chromeos::ProfileHelper::Get();
     const std::string user_id_hash =
@@ skipping 307 matching lines @@
 
   // Setting a pref which is not applicable to a system (i.e., Android in this
   // case) does not necessarily create it. Don't bother continuing with the
   // test if this pref doesn't exist because it will not load the profiles if
   // it cannot verify that the pref for background mode is enabled.
   if (!local_state_.Get()->HasPrefPath(prefs::kBackgroundModeEnabled))
     return;
 
   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);
   EXPECT_EQ(3u, cache.GetNumberOfProfiles());
 
   profile_manager->AutoloadProfiles();
 
   EXPECT_EQ(2u, profile_manager->GetLoadedProfiles().size());
 }
 
 TEST_F(ProfileManagerTest, DoNotAutoloadProfilesIfBackgroundModeOff) {
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   local_state_.Get()->SetUserPref(prefs::kBackgroundModeEnabled,
                                   new base::FundamentalValue(false));
 
   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);
   EXPECT_EQ(2u, cache.GetNumberOfProfiles());
 
   profile_manager->AutoloadProfiles();
 
   EXPECT_EQ(0u, profile_manager->GetLoadedProfiles().size());
 }
 
@@ skipping 587 matching lines @@
   const base::string16 default_profile_name =
       l10n_util::GetStringUTF16(IDS_SINGLE_PROFILE_DISPLAY_NAME);
   const base::string16 profile_name1 = cache.ChooseNameForNewProfile(0);
   Profile* profile1 = AddProfileToCache(profile_manager,
                                         "path_1", profile_name1);
   EXPECT_EQ(default_profile_name,
             profiles::GetAvatarNameForProfile(profile1->GetPath()));
 
   // 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));
   EXPECT_EQ(gaia_given_name,
       profiles::GetAvatarNameForProfile(profile1->GetPath()));
 
   // Multiple profiles means displaying the actual profile names.
   const base::string16 profile_name2 = cache.ChooseNameForNewProfile(1);
   Profile* profile2 = AddProfileToCache(profile_manager,
                                         "path_2", profile_name2);
@@ skipping 33 matching lines @@
   Profile* profile3 = AddProfileToCache(
       profile_manager, "path_3", profile_name3);
   EXPECT_EQ(3u, cache.GetNumberOfProfiles());
 
   // Sign in all profiles, and make sure they do not have a Gaia name set.
   const base::string16 email1(ASCIIToUTF16("user1@gmail.com"));
   const base::string16 email2(ASCIIToUTF16("user2@gmail.com"));
   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());
 
   // The profiles with default names should display the email address.
   EXPECT_EQ(email1, profiles::GetAvatarNameForProfile(profile1->GetPath()));
   EXPECT_EQ(email2, profiles::GetAvatarNameForProfile(profile2->GetPath()));
 
   // The profile with the custom name should display that.
   EXPECT_EQ(profile_name3,
             profiles::GetAvatarNameForProfile(profile3->GetPath()));
@@ skipping 22 matching lines @@
   base::FilePath dest_path2 = temp_dir_.path().AppendASCII(profile_name2);
 
   MockObserver mock_observer;
   EXPECT_CALL(mock_observer, OnProfileCreated(
       testing::NotNull(), NotFail())).Times(testing::AtLeast(2));
   CreateProfileAsync(profile_manager, profile_name1, false, &mock_observer);
   base::RunLoop().RunUntilIdle();
 
   // 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();
 
   EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size());
   EXPECT_EQ(2u, cache.GetNumberOfProfiles());
 
   // Set the active profile.
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetString(prefs::kProfileLastUsed,
                          dest_path1.BaseName().MaybeAsASCII());
@@ skipping 30 matching lines @@
   EXPECT_CALL(mock_observer, OnProfileCreated(
       testing::NotNull(), NotFail())).Times(testing::AtLeast(2));
   CreateProfileAsync(profile_manager, profile_name1, false, &mock_observer);
   base::RunLoop().RunUntilIdle();
 
   // Create the other profiles, but don't load them. Assign a fake avatar icon
   // to ensure that profiles in the info cache are sorted by the profile name,
   // 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();
 
   EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size());
   EXPECT_EQ(3u, cache.GetNumberOfProfiles());
 
   // Set the active profile.
   PrefService* local_state = g_browser_process->local_state();
   local_state->SetString(prefs::kProfileLastUsed,
                          dest_path1.BaseName().MaybeAsASCII());
@@ skipping 11 matching lines @@
                          dest_path2.BaseName().MaybeAsASCII());
   profile_manager->ScheduleProfileForDeletion(dest_path2,
                                               ProfileManager::CreateCallback());
   // Spin the message loop so that all the callbacks can finish running.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath());
   EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed));
 }
 #endif  // !defined(OS_MACOSX)