Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(156)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 1794353003: Refactor ProfileInfoCache in c/b/profiles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/profiles/profile_manager.cc ('K') | « chrome/browser/profiles/profile_manager_browsertest.cc ('k') | chrome/browser/profiles/profile_metrics.cc » ('j') | chrome/browser/profiles/profile_window.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 9b123393a2058816673a3bea182ce48feeea65d9..d39ae1218dc05739b0b65ca4f433762e68965a85 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -142,17 +142,18 @@ class ProfileManagerTest : public testing::Test {
is_supervised ? "Dummy ID" : std::string());
}
- // 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();
+ // Helper function to add a profile with |profile_name| to |profile_manager|'s
+ // ProfileAttributesStorage, and return the profile created.
+ Profile* AddProfileToStorage(ProfileManager* profile_manager,
+ const std::string& path_suffix,
+ const base::string16& profile_name) {
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ size_t num_profiles = storage.GetNumberOfProfiles();
base::FilePath path = temp_dir_.path().AppendASCII(path_suffix);
- cache.AddProfileToCache(path, profile_name,
- std::string(), base::string16(), 0, std::string());
- EXPECT_EQ(num_profiles + 1, cache.GetNumberOfProfiles());
+ storage.AddProfile(path, profile_name, std::string(), base::string16(), 0,
+ std::string());
+ EXPECT_EQ(num_profiles + 1u, storage.GetNumberOfProfiles());
return profile_manager->GetProfile(path);
}
@@ -339,29 +340,31 @@ TEST_F(ProfileManagerTest, CreateProfileAsyncCheckOmitted) {
testing::NotNull(), NotFail())).Times(testing::AtLeast(2));
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
CreateProfileAsync(profile_manager, name, true, &mock_observer);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(1u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
// Supervised profiles should start out omitted from the profile list.
- EXPECT_TRUE(cache.IsOmittedProfileAtIndex(0));
+ EXPECT_TRUE(storage.GetAllProfilesAttributesSortedByName()[0u]->IsOmitted());
name = "1 Regular Profile";
CreateProfileAsync(profile_manager, name, false, &mock_observer);
base::RunLoop().RunUntilIdle();
- EXPECT_EQ(2u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(2u, storage.GetNumberOfProfiles());
// Non-supervised profiles should be included in the profile list.
- EXPECT_FALSE(cache.IsOmittedProfileAtIndex(1));
+ EXPECT_FALSE(storage.GetAllProfilesAttributesSortedByName()[1u]->IsOmitted());
}
-TEST_F(ProfileManagerTest, AddProfileToCacheCheckOmitted) {
+TEST_F(ProfileManagerTest, AddProfileToStorageCheckOmitted) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
const base::FilePath supervised_path =
temp_dir_.path().AppendASCII("Supervised");
@@ -371,8 +374,8 @@ TEST_F(ProfileManagerTest, AddProfileToCacheCheckOmitted) {
// RegisterTestingProfile adds the profile to the cache and takes ownership.
profile_manager->RegisterTestingProfile(supervised_profile, true, false);
- EXPECT_EQ(1u, cache.GetNumberOfProfiles());
- EXPECT_TRUE(cache.IsOmittedProfileAtIndex(0));
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
+ EXPECT_TRUE(storage.GetAllProfilesAttributesSortedByName()[0u]->IsOmitted());
const base::FilePath nonsupervised_path = temp_dir_.path().AppendASCII(
"Non-Supervised");
@@ -380,12 +383,13 @@ TEST_F(ProfileManagerTest, AddProfileToCacheCheckOmitted) {
NULL);
profile_manager->RegisterTestingProfile(nonsupervised_profile, true, false);
- EXPECT_EQ(2u, cache.GetNumberOfProfiles());
- size_t supervised_index = cache.GetIndexOfProfileWithPath(supervised_path);
- EXPECT_TRUE(cache.IsOmittedProfileAtIndex(supervised_index));
- size_t nonsupervised_index =
- cache.GetIndexOfProfileWithPath(nonsupervised_path);
- EXPECT_FALSE(cache.IsOmittedProfileAtIndex(nonsupervised_index));
+ EXPECT_EQ(2u, storage.GetNumberOfProfiles());
+ ProfileAttributesEntry* entry;
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(supervised_path, &entry));
+ EXPECT_TRUE(entry->IsOmitted());
+
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(nonsupervised_path, &entry));
+ EXPECT_FALSE(entry->IsOmitted());
}
TEST_F(ProfileManagerTest, GetGuestProfilePath) {
@@ -468,7 +472,8 @@ TEST_F(ProfileManagerGuestTest, GuestProfileIngonito) {
TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
local_state_.Get()->SetUserPref(prefs::kBackgroundModeEnabled,
new base::FundamentalValue(true));
@@ -479,19 +484,21 @@ TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
if (!local_state_.Get()->HasPrefPath(prefs::kBackgroundModeEnabled))
return;
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
- cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"),
- ASCIIToUTF16("name_1"), "12345", base::string16(), 0,
- std::string());
- cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"),
- ASCIIToUTF16("name_2"), "23456", base::string16(), 0,
- std::string());
- cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_3"),
- ASCIIToUTF16("name_3"), "34567", base::string16(), 0,
- std::string());
- cache.SetBackgroundStatusOfProfileAtIndex(0, true);
- cache.SetBackgroundStatusOfProfileAtIndex(2, true);
- EXPECT_EQ(3u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
+
+ storage.AddProfile(profile_manager->user_data_dir().AppendASCII("path_1"),
+ ASCIIToUTF16("name_1"), "12345", base::string16(), 0, std::string());
+ storage.AddProfile(profile_manager->user_data_dir().AppendASCII("path_2"),
+ ASCIIToUTF16("name_2"), "23456", base::string16(), 0, std::string());
+ storage.AddProfile(profile_manager->user_data_dir().AppendASCII("path_3"),
+ ASCIIToUTF16("name_3"), "34567", base::string16(), 0, std::string());
+
+ EXPECT_EQ(3u, storage.GetNumberOfProfiles());
+
+ std::vector<ProfileAttributesEntry*> entries =
+ storage.GetAllProfilesAttributes();
+ entries[0u]->SetBackgroundStatus(true);
+ entries[2u]->SetBackgroundStatus(true);
profile_manager->AutoloadProfiles();
@@ -500,20 +507,24 @@ TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) {
TEST_F(ProfileManagerTest, DoNotAutoloadProfilesIfBackgroundModeOff) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
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"), "12345", base::string16(), 0,
- std::string());
- cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"),
- ASCIIToUTF16("name_2"), "23456", base::string16(), 0,
- std::string());
- cache.SetBackgroundStatusOfProfileAtIndex(0, false);
- cache.SetBackgroundStatusOfProfileAtIndex(1, true);
- EXPECT_EQ(2u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
+
+ storage.AddProfile(profile_manager->user_data_dir().AppendASCII("path_1"),
+ ASCIIToUTF16("name_1"), "12345", base::string16(), 0, std::string());
+ storage.AddProfile(profile_manager->user_data_dir().AppendASCII("path_2"),
+ ASCIIToUTF16("name_2"), "23456", base::string16(), 0, std::string());
+
+ EXPECT_EQ(2u, storage.GetNumberOfProfiles());
+
+ std::vector<ProfileAttributesEntry*> entries =
+ storage.GetAllProfilesAttributes();
+ entries[0u]->SetBackgroundStatus(false);
+ entries[1u]->SetBackgroundStatus(true);
profile_manager->AutoloadProfiles();
@@ -551,7 +562,6 @@ TEST_F(ProfileManagerTest, InitProfileInfoCacheForAProfile) {
dest_path = dest_path.Append(FILE_PATH_LITERAL("New Profile"));
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
// Successfully create the profile
Profile* profile = profile_manager->GetProfile(dest_path);
@@ -562,13 +572,13 @@ TEST_F(ProfileManagerTest, InitProfileInfoCacheForAProfile) {
size_t avatar_index =
profile->GetPrefs()->GetInteger(prefs::kProfileAvatarIndex);
- size_t profile_index = cache.GetIndexOfProfileWithPath(dest_path);
+ ProfileAttributesEntry* entry;
+ ASSERT_TRUE(profile_manager->GetProfileAttributesStorage().
+ GetProfileAttributesWithPath(dest_path, &entry));
// Check if the profile prefs are the same as the cache prefs
- EXPECT_EQ(profile_name,
- base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
- EXPECT_EQ(avatar_index,
- cache.GetAvatarIconIndexOfProfileAtIndex(profile_index));
+ EXPECT_EQ(profile_name, base::UTF16ToUTF8(entry->GetName()));
+ EXPECT_EQ(avatar_index, entry->GetAvatarIconIndex());
}
TEST_F(ProfileManagerTest, GetLastUsedProfileAllowedByPolicy) {
@@ -880,23 +890,24 @@ TEST_F(ProfileManagerTest, EphemeralProfilesDontEndUpAsLastOpenedAtShutdown) {
TEST_F(ProfileManagerTest, CleanUpEphemeralProfiles) {
// Create two profiles, one of them ephemeral.
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- ASSERT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ ASSERT_EQ(0u, storage.GetNumberOfProfiles());
const std::string profile_name1 = "Homer";
- base::FilePath path1 = temp_dir_.path().AppendASCII(profile_name1);
- cache.AddProfileToCache(path1, base::UTF8ToUTF16(profile_name1),
- std::string(), base::UTF8ToUTF16(profile_name1), 0,
- std::string());
- cache.SetProfileIsEphemeralAtIndex(0, true);
+ base::FilePath path1 =
+ profile_manager->user_data_dir().AppendASCII(profile_name1);
+ storage.AddProfile(path1, base::UTF8ToUTF16(profile_name1), std::string(),
+ base::UTF8ToUTF16(profile_name1), 0, std::string());
+ storage.GetAllProfilesAttributes()[0u]->SetIsEphemeral(true);
ASSERT_TRUE(base::CreateDirectory(path1));
const std::string profile_name2 = "Marge";
- base::FilePath path2 = temp_dir_.path().AppendASCII(profile_name2);
- cache.AddProfileToCache(path2, base::UTF8ToUTF16(profile_name2),
- std::string(), base::UTF8ToUTF16(profile_name2), 0,
- std::string());
- ASSERT_EQ(2u, cache.GetNumberOfProfiles());
+ base::FilePath path2 =
+ profile_manager->user_data_dir().AppendASCII(profile_name2);
+ storage.AddProfile(path2, base::UTF8ToUTF16(profile_name2), std::string(),
+ base::UTF8ToUTF16(profile_name2), 0, std::string());
+ ASSERT_EQ(2u, storage.GetNumberOfProfiles());
ASSERT_TRUE(base::CreateDirectory(path2));
// Set the active profile.
@@ -911,16 +922,16 @@ TEST_F(ProfileManagerTest, CleanUpEphemeralProfiles) {
EXPECT_FALSE(base::DirectoryExists(path1));
EXPECT_TRUE(base::DirectoryExists(path2));
EXPECT_EQ(profile_name2, local_state->GetString(prefs::kProfileLastUsed));
- ASSERT_EQ(1u, cache.GetNumberOfProfiles());
+ ASSERT_EQ(1u, storage.GetNumberOfProfiles());
// Mark the remaining profile ephemeral and clean up.
- cache.SetProfileIsEphemeralAtIndex(0, true);
+ storage.GetAllProfilesAttributes()[0u]->SetIsEphemeral(true);
profile_manager->CleanUpEphemeralProfiles();
base::RunLoop().RunUntilIdle();
// The profile should be deleted, and the last used profile set to a new one.
EXPECT_FALSE(base::DirectoryExists(path2));
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
EXPECT_EQ("Profile 1", local_state->GetString(prefs::kProfileLastUsed));
}
@@ -943,7 +954,8 @@ TEST_F(ProfileManagerTest, ActiveProfileDeleted) {
base::RunLoop().RunUntilIdle();
EXPECT_EQ(2u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(2u, profile_manager->GetProfileInfoCache().GetNumberOfProfiles());
+ EXPECT_EQ(2u, profile_manager->GetProfileAttributesStorage().
+ GetNumberOfProfiles());
// Set the active profile.
PrefService* local_state = g_browser_process->local_state();
@@ -962,6 +974,8 @@ TEST_F(ProfileManagerTest, ActiveProfileDeleted) {
TEST_F(ProfileManagerTest, LastProfileDeleted) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
ASSERT_TRUE(profile_manager);
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
// Create and load a profile.
const std::string profile_name1 = "New Profile 1";
@@ -975,7 +989,7 @@ TEST_F(ProfileManagerTest, LastProfileDeleted) {
base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(1u, profile_manager->GetProfileInfoCache().GetNumberOfProfiles());
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
// Set it as the active profile.
PrefService* local_state = g_browser_process->local_state();
@@ -993,13 +1007,14 @@ TEST_F(ProfileManagerTest, LastProfileDeleted) {
EXPECT_EQ(dest_path2, profile_manager->GetLastUsedProfile()->GetPath());
EXPECT_EQ(profile_name2, local_state->GetString(prefs::kProfileLastUsed));
- EXPECT_EQ(dest_path2,
- profile_manager->GetProfileInfoCache().GetPathOfProfileAtIndex(0));
+ EXPECT_EQ(dest_path2, storage.GetAllProfilesAttributes()[0u]->GetPath());
}
TEST_F(ProfileManagerTest, LastProfileDeletedWithGuestActiveProfile) {
ProfileManager* profile_manager = g_browser_process->profile_manager();
ASSERT_TRUE(profile_manager);
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
// Create and load a profile.
const std::string profile_name1 = "New Profile 1";
@@ -1013,7 +1028,7 @@ TEST_F(ProfileManagerTest, LastProfileDeletedWithGuestActiveProfile) {
base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(1u, profile_manager->GetProfileInfoCache().GetNumberOfProfiles());
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
// Create the profile and register it.
const std::string guest_profile_name =
@@ -1027,9 +1042,9 @@ TEST_F(ProfileManagerTest, LastProfileDeletedWithGuestActiveProfile) {
// Registering the profile passes ownership to the ProfileManager.
profile_manager->RegisterTestingProfile(guest_profile, false, false);
- // The Guest profile does not get added to the ProfileInfoCache.
+ // The Guest profile does not get added to the ProfileAttributesStorage.
EXPECT_EQ(2u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(1u, profile_manager->GetProfileInfoCache().GetNumberOfProfiles());
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
// Set the Guest profile as the active profile.
PrefService* local_state = g_browser_process->local_state();
@@ -1046,9 +1061,8 @@ TEST_F(ProfileManagerTest, LastProfileDeletedWithGuestActiveProfile) {
base::FilePath dest_path2 = temp_dir_.path().AppendASCII(profile_name2);
EXPECT_EQ(3u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(1u, profile_manager->GetProfileInfoCache().GetNumberOfProfiles());
- EXPECT_EQ(dest_path2,
- profile_manager->GetProfileInfoCache().GetPathOfProfileAtIndex(0));
+ EXPECT_EQ(1u, storage.GetNumberOfProfiles());
+ EXPECT_EQ(dest_path2, storage.GetAllProfilesAttributes()[0u]->GetPath());
}
TEST_F(ProfileManagerTest, ProfileDisplayNameResetsDefaultName) {
@@ -1056,22 +1070,23 @@ TEST_F(ProfileManagerTest, ProfileDisplayNameResetsDefaultName) {
return;
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
// Only one local profile means we display IDS_SINGLE_PROFILE_DISPLAY_NAME.
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);
+ const base::string16 profile_name1 = storage.ChooseNameForNewProfile(0u);
+ Profile* profile1 = AddProfileToStorage(profile_manager,
+ "path_1", profile_name1);
EXPECT_EQ(default_profile_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);
+ const base::string16 profile_name2 = storage.ChooseNameForNewProfile(1u);
+ Profile* profile2 = AddProfileToStorage(profile_manager,
+ "path_2", profile_name2);
EXPECT_EQ(profile_name1,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
EXPECT_EQ(profile_name2,
@@ -1091,30 +1106,33 @@ TEST_F(ProfileManagerTest, ProfileDisplayNamePreservesCustomName) {
return;
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
// Only one local profile means we display IDS_SINGLE_PROFILE_DISPLAY_NAME.
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);
+ const base::string16 profile_name1 = storage.ChooseNameForNewProfile(0u);
+ Profile* profile1 = AddProfileToStorage(profile_manager,
+ "path_1", profile_name1);
EXPECT_EQ(default_profile_name,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
+ ASSERT_EQ(1u, storage.GetNumberOfProfiles());
// We should display custom names for local profiles.
const base::string16 custom_profile_name = ASCIIToUTF16("Batman");
- cache.SetNameOfProfileAtIndex(0, custom_profile_name);
- cache.SetProfileIsUsingDefaultNameAtIndex(0, false);
- EXPECT_EQ(custom_profile_name, cache.GetNameOfProfileAtIndex(0));
+ ProfileAttributesEntry* entry = storage.GetAllProfilesAttributes()[0u];
+ entry->SetName(custom_profile_name);
+ entry->SetIsUsingDefaultName(false);
+ EXPECT_EQ(custom_profile_name, entry->GetName());
EXPECT_EQ(custom_profile_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);
+ const base::string16 profile_name2 = storage.ChooseNameForNewProfile(1u);
+ Profile* profile2 = AddProfileToStorage(profile_manager,
+ "path_2", profile_name2);
EXPECT_EQ(custom_profile_name,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
EXPECT_EQ(profile_name2,
@@ -1134,38 +1152,40 @@ TEST_F(ProfileManagerTest, ProfileDisplayNamePreservesSignedInName) {
return;
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
// Only one local profile means we display IDS_SINGLE_PROFILE_DISPLAY_NAME.
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);
+ const base::string16 profile_name1 = storage.ChooseNameForNewProfile(0u);
+ Profile* profile1 = AddProfileToStorage(profile_manager,
+ "path_1", profile_name1);
EXPECT_EQ(default_profile_name,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
+ ProfileAttributesEntry* entry = storage.GetAllProfilesAttributes()[0u];
// For a signed in profile with a default name we still display
// IDS_SINGLE_PROFILE_DISPLAY_NAME.
- cache.SetAuthInfoOfProfileAtIndex(0, "12345", ASCIIToUTF16("user@gmail.com"));
- EXPECT_EQ(profile_name1, cache.GetNameOfProfileAtIndex(0));
+ entry->SetAuthInfo("12345", ASCIIToUTF16("user@gmail.com"));
+ EXPECT_EQ(profile_name1, entry->GetName());
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.SetAuthInfoOfProfileAtIndex(0, "12345", ASCIIToUTF16("user@gmail.com"));
+ entry->SetAuthInfo("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));
+ entry->SetGAIAGivenName(gaia_given_name);
+ EXPECT_EQ(gaia_given_name, entry->GetName());
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);
+ const base::string16 profile_name2 = storage.ChooseNameForNewProfile(1u);
+ Profile* profile2 = AddProfileToStorage(profile_manager,
+ "path_2", profile_name2);
EXPECT_EQ(gaia_given_name,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
EXPECT_EQ(profile_name2,
@@ -1185,40 +1205,46 @@ TEST_F(ProfileManagerTest, ProfileDisplayNameIsEmailIfDefaultName) {
return;
ProfileManager* profile_manager = g_browser_process->profile_manager();
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- EXPECT_EQ(0u, cache.GetNumberOfProfiles());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ EXPECT_EQ(0u, storage.GetNumberOfProfiles());
// Create two signed in profiles, with both new and legacy default names, and
// a profile with a custom name.
- Profile* profile1 = AddProfileToCache(
- profile_manager, "path_1", ASCIIToUTF16("Person 1"));
- Profile* profile2 = AddProfileToCache(
- profile_manager, "path_2", ASCIIToUTF16("Default Profile"));
+ Profile* profile1 = AddProfileToStorage(profile_manager, "path_1",
+ ASCIIToUTF16("Person 1"));
+ Profile* profile2 = AddProfileToStorage(profile_manager, "path_2",
+ ASCIIToUTF16("Default Profile"));
const base::string16 profile_name3(ASCIIToUTF16("Batman"));
- Profile* profile3 = AddProfileToCache(
- profile_manager, "path_3", profile_name3);
- EXPECT_EQ(3u, cache.GetNumberOfProfiles());
+ Profile* profile3 = AddProfileToStorage(profile_manager, "path_3",
+ profile_name3);
+ EXPECT_EQ(3u, storage.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.SetAuthInfoOfProfileAtIndex(index, "12345", email1);
- cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
- cache.SetGAIANameOfProfileAtIndex(index, base::string16());
+ ProfileAttributesEntry* entry;
- // This may resort the cache, so be extra cautious to use the right profile.
- index = cache.GetIndexOfProfileWithPath(profile2->GetPath());
- cache.SetAuthInfoOfProfileAtIndex(index, "23456", email2);
- cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
- cache.SetGAIANameOfProfileAtIndex(index, base::string16());
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(profile1->GetPath(),
+ &entry));
+ entry->SetAuthInfo("12345", email1);
+ entry->SetGAIAGivenName(base::string16());
+ entry->SetGAIAName(base::string16());
- index = cache.GetIndexOfProfileWithPath(profile3->GetPath());
- cache.SetAuthInfoOfProfileAtIndex(index, "34567", email3);
- cache.SetGAIAGivenNameOfProfileAtIndex(index, base::string16());
- cache.SetGAIANameOfProfileAtIndex(index, base::string16());
+ // This may resort the cache, so be extra cautious to use the right profile.
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(profile2->GetPath(),
+ &entry));
+ entry->SetAuthInfo("23456", email2);
+ entry->SetGAIAGivenName(base::string16());
+ entry->SetGAIAName(base::string16());
+
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(profile3->GetPath(),
+ &entry));
+ entry->SetAuthInfo("34567", email3);
+ entry->SetGAIAGivenName(base::string16());
+ entry->SetGAIAName(base::string16());
// The profiles with default names should display the email address.
EXPECT_EQ(email1, profiles::GetAvatarNameForProfile(profile1->GetPath()));
@@ -1231,8 +1257,9 @@ TEST_F(ProfileManagerTest, ProfileDisplayNameIsEmailIfDefaultName) {
// Adding a Gaia name to a profile that previously had a default name should
// start displaying it.
const base::string16 gaia_given_name(ASCIIToUTF16("Robin"));
- cache.SetGAIAGivenNameOfProfileAtIndex(
- cache.GetIndexOfProfileWithPath(profile1->GetPath()), gaia_given_name);
+ ASSERT_TRUE(storage.GetProfileAttributesWithPath(profile1->GetPath(),
+ &entry));
+ entry->SetGAIAGivenName(gaia_given_name);
EXPECT_EQ(gaia_given_name,
profiles::GetAvatarNameForProfile(profile1->GetPath()));
}
@@ -1258,13 +1285,14 @@ TEST_F(ProfileManagerTest, ActiveProfileDeletedNeedsToLoadNextProfile) {
base::RunLoop().RunUntilIdle();
// Track the profile, but don't load it.
- ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
- cache.AddProfileToCache(dest_path2, ASCIIToUTF16(profile_name2), "23456",
- base::string16(), 0, std::string());
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ storage.AddProfile(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());
+ EXPECT_EQ(2u, storage.GetNumberOfProfiles());
// Set the active profile.
PrefService* local_state = g_browser_process->local_state();
@@ -1306,20 +1334,19 @@ TEST_F(ProfileManagerTest, ActiveProfileDeletedNextProfileDeletedToo) {
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),
- "23456", ASCIIToUTF16(profile_name2), 1,
- std::string());
- cache.AddProfileToCache(dest_path3, ASCIIToUTF16(profile_name3),
- "34567", ASCIIToUTF16(profile_name3), 2,
- std::string());
+ // to ensure that profiles in the profile attributes storage are sorted by the
+ // profile name, and not randomly by the avatar name.
+ ProfileAttributesStorage& storage =
+ profile_manager->GetProfileAttributesStorage();
+ storage.AddProfilee(dest_path2, ASCIIToUTF16(profile_name2), "23456",
+ ASCIIToUTF16(profile_name2), 1, std::string());
+ storage.AddProfile(dest_path3, ASCIIToUTF16(profile_name3), "34567",
+ ASCIIToUTF16(profile_name3), 2, std::string());
base::RunLoop().RunUntilIdle();
EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size());
- EXPECT_EQ(3u, cache.GetNumberOfProfiles());
+ EXPECT_EQ(3u, storage.GetNumberOfProfiles());
// Set the active profile.
PrefService* local_state = g_browser_process->local_state();
« chrome/browser/profiles/profile_manager.cc ('K') | « chrome/browser/profiles/profile_manager_browsertest.cc ('k') | chrome/browser/profiles/profile_metrics.cc » ('j') | chrome/browser/profiles/profile_window.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698