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

Unified Diff: chrome/test/base/testing_profile.h

Issue 316863002: Rename "managed (mode|user)" to "supervised user" (part 1) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 6 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
« no previous file with comments | « chrome/common/url_constants.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_profile.h
diff --git a/chrome/test/base/testing_profile.h b/chrome/test/base/testing_profile.h
index d573cf1a02dff501a1c0b57dccf4409f72e0dc96..69a3c93b98e9057f1f0967e12da38fe7ed6018b5 100644
--- a/chrome/test/base/testing_profile.h
+++ b/chrome/test/base/testing_profile.h
@@ -100,9 +100,9 @@ class TestingProfile : public Profile {
// Makes the Profile being built a guest profile.
void SetGuestSession();
- // Sets the managed user ID (which is empty by default). If it is set to a
- // non-empty string, the profile is managed.
- void SetManagedUserId(const std::string& managed_user_id);
+ // Sets the supervised user ID (which is empty by default). If it is set to
+ // a non-empty string, the profile is supervised.
+ void SetSupervisedUserId(const std::string& supervised_user_id);
// Sets the PolicyService to be used by this profile.
void SetPolicyService(scoped_ptr<policy::PolicyService> policy_service);
@@ -121,7 +121,7 @@ class TestingProfile : public Profile {
Delegate* delegate_;
bool incognito_;
bool guest_session_;
- std::string managed_user_id_;
+ std::string supervised_user_id_;
scoped_ptr<policy::PolicyService> policy_service_;
TestingFactories testing_factories_;
@@ -149,7 +149,7 @@ class TestingProfile : public Profile {
scoped_ptr<PrefServiceSyncable> prefs,
bool incognito,
bool guest_session,
- const std::string& managed_user_id,
+ const std::string& supervised_user_id,
scoped_ptr<policy::PolicyService> policy_service,
const TestingFactories& factories);
@@ -250,7 +250,7 @@ class TestingProfile : public Profile {
virtual void DestroyOffTheRecordProfile() OVERRIDE {}
virtual bool HasOffTheRecordProfile() OVERRIDE;
virtual Profile* GetOriginalProfile() OVERRIDE;
- virtual bool IsManaged() OVERRIDE;
+ virtual bool IsSupervised() OVERRIDE;
virtual ExtensionService* GetExtensionService() OVERRIDE;
void SetExtensionSpecialStoragePolicy(
ExtensionSpecialStoragePolicy* extension_special_storage_policy);
@@ -381,7 +381,7 @@ class TestingProfile : public Profile {
bool guest_session_;
- std::string managed_user_id_;
+ std::string supervised_user_id_;
// Did the last session exit cleanly? Default is true.
bool last_session_exited_cleanly_;
« no previous file with comments | « chrome/common/url_constants.cc ('k') | chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698