Rename "managed (mode|user)" to "supervised user" (part 1)
This CL changes:
- "IsManaged" and similar methods in Profile, ProfileInfoCache, and a few other places (which mostly forward to either of those)
- Enum and constant names
- Variable names
- Comments
Still missing:
- I almost certainly missed a few variables and comments
- The actual SU implementation, i.e. c/b/managed_mode/
- JavaScript
- Resource names
But since this CL is already way too huge, I'll try to commit this part now and do the rest in one or more followup CLs.
[email protected] (chrome/)
[email protected] (google_apis/)
[email protected] (sync/ and components/sync_driver/)
All the TBRs are simple renames.
BUG=none
Review URL: https://codereview.chromium.org/316863002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@276722 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
index 0204523..04c63ab 100644
--- a/chrome/test/base/testing_profile.cc
+++ b/chrome/test/base/testing_profile.cc
@@ -246,7 +246,7 @@
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)
: start_time_(Time::Now()),
@@ -256,7 +256,7 @@
force_incognito_(false),
original_profile_(NULL),
guest_session_(guest_session),
- managed_user_id_(managed_user_id),
+ supervised_user_id_(supervised_user_id),
last_session_exited_cleanly_(true),
extension_special_storage_policy_(extension_policy),
profile_path_(path),
@@ -637,8 +637,8 @@
return this;
}
-bool TestingProfile::IsManaged() {
- return !managed_user_id_.empty();
+bool TestingProfile::IsSupervised() {
+ return !supervised_user_id_.empty();
}
ExtensionService* TestingProfile::GetExtensionService() {
@@ -959,9 +959,9 @@
guest_session_ = true;
}
-void TestingProfile::Builder::SetManagedUserId(
- const std::string& managed_user_id) {
- managed_user_id_ = managed_user_id;
+void TestingProfile::Builder::SetSupervisedUserId(
+ const std::string& supervised_user_id) {
+ supervised_user_id_ = supervised_user_id;
}
void TestingProfile::Builder::SetPolicyService(
@@ -986,7 +986,7 @@
pref_service_.Pass(),
incognito_,
guest_session_,
- managed_user_id_,
+ supervised_user_id_,
policy_service_.Pass(),
testing_factories_));
}
