diff options
| author | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 14:13:13 +0000 |
|---|---|---|
| committer | ibraaaa@chromium.org <ibraaaa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-05 14:13:13 +0000 |
| commit | a6e01b4079bf48ed481b44fb577ab8b40e86effb (patch) | |
| tree | e37cf68b1487e189b3a83af0b6743ddb1fb082fc /chrome/browser/profiles/profile_manager_unittest.cc | |
| parent | 131eb68a409292e6b7728fa09c0ce8333d59f444 (diff) | |
| download | chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.zip chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.tar.gz chromium_src-a6e01b4079bf48ed481b44fb577ab8b40e86effb.tar.bz2 | |
Store the managed user ID in |ProfileInfoCache| instead of |is_managed| flag.
Updates |ProfileManager::CreateMultiProfileAsync| to take |managed_user_id| instead of the |is_managed| flag, the user is managed if |managed_user_id| is not empty.
The preference |prefs::kManagedUserId| is added to hold the managed user ID. |prefs::kProfileIsManaged| should eventually be deleted.
TBR=nkostylev@chromium.org, tapted@chromium.org, jochen@chromium.org
BUG=None
Review URL: https://chromiumcodereview.appspot.com/21496004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215610 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/profiles/profile_manager_unittest.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_manager_unittest.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 3b49eac..dd2417b 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -125,7 +125,7 @@ class ProfileManagerTest : public testing::Test { base::Unretained(mock_observer)), UTF8ToUTF16(name), string16(), - false); + std::string()); } #if defined(OS_CHROMEOS) @@ -319,11 +319,11 @@ TEST_F(ProfileManagerTest, AutoloadProfilesWithBackgroundApps) { EXPECT_EQ(0u, cache.GetNumberOfProfiles()); cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"), - ASCIIToUTF16("name_1"), string16(), 0, false); + ASCIIToUTF16("name_1"), string16(), 0, std::string()); cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"), - ASCIIToUTF16("name_2"), string16(), 0, false); + ASCIIToUTF16("name_2"), string16(), 0, std::string()); cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_3"), - ASCIIToUTF16("name_3"), string16(), 0, false); + ASCIIToUTF16("name_3"), string16(), 0, std::string()); cache.SetBackgroundStatusOfProfileAtIndex(0, true); cache.SetBackgroundStatusOfProfileAtIndex(2, true); EXPECT_EQ(3u, cache.GetNumberOfProfiles()); @@ -341,9 +341,9 @@ TEST_F(ProfileManagerTest, DoNotAutoloadProfilesIfBackgroundModeOff) { EXPECT_EQ(0u, cache.GetNumberOfProfiles()); cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_1"), - ASCIIToUTF16("name_1"), string16(), 0, false); + ASCIIToUTF16("name_1"), string16(), 0, std::string()); cache.AddProfileToCache(cache.GetUserDataDir().AppendASCII("path_2"), - ASCIIToUTF16("name_2"), string16(), 0, false); + ASCIIToUTF16("name_2"), string16(), 0, std::string()); cache.SetBackgroundStatusOfProfileAtIndex(0, false); cache.SetBackgroundStatusOfProfileAtIndex(1, true); EXPECT_EQ(2u, cache.GetNumberOfProfiles()); @@ -684,7 +684,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), - string16(), 0, false); + string16(), 0, std::string()); base::RunLoop().RunUntilIdle(); EXPECT_EQ(1u, profile_manager->GetLoadedProfiles().size()); @@ -737,9 +737,9 @@ 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, false); + ASCIIToUTF16(profile_name2), 1, std::string()); cache.AddProfileToCache(dest_path3, ASCIIToUTF16(profile_name3), - ASCIIToUTF16(profile_name3), 2, false); + ASCIIToUTF16(profile_name3), 2, std::string()); base::RunLoop().RunUntilIdle(); |