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_browsertest.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_browsertest.cc')
| -rw-r--r-- | chrome/browser/profiles/profile_manager_browsertest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/profiles/profile_manager_browsertest.cc b/chrome/browser/profiles/profile_manager_browsertest.cc index 84c7279..cd9d8e8 100644 --- a/chrome/browser/profiles/profile_manager_browsertest.cc +++ b/chrome/browser/profiles/profile_manager_browsertest.cc @@ -124,7 +124,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DISABLED_DeleteAllProfiles) { base::FilePath new_path = profile_manager->GenerateNextProfileDirectoryPath(); profile_manager->CreateProfileAsync(new_path, base::Bind(&OnUnblockOnProfileCreation), - string16(), string16(), false); + string16(), string16(), std::string()); // Spin to allow profile creation to take place, loop is terminated // by OnUnblockOnProfileCreation when the profile is created. @@ -171,7 +171,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, string16(), // name string16(), // icon url base::Bind(ProfileCreationComplete), - false); + std::string()); // Wait for profile to finish loading. content::RunMessageLoop(); EXPECT_EQ(profile_manager->GetNumberOfProfiles(), 2U); @@ -209,7 +209,7 @@ IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, profile_manager->GenerateNextProfileDirectoryPath(); profile_manager->CreateProfileAsync(path_profile2, base::Bind(&OnUnblockOnProfileCreation), - string16(), string16(), false); + string16(), string16(), std::string()); // Spin to allow profile creation to take place, loop is terminated // by OnUnblockOnProfileCreation when the profile is created. |