Rename "managed (mode|user)" to "supervised user" (part 2)

chrome/browser/supervised_user/permission_request_creator_sync.cc

Index: chrome/browser/supervised_user/permission_request_creator_sync.cc
diff --git a/chrome/browser/managed_mode/permission_request_creator_sync.cc b/chrome/browser/supervised_user/permission_request_creator_sync.cc
similarity index 64%
rename from chrome/browser/managed_mode/permission_request_creator_sync.cc
rename to chrome/browser/supervised_user/permission_request_creator_sync.cc
index d7f6190fe4a7b3eac9834e7b539336f506291299..4ad68c5ba2cecb2ef5d5c94587e1afe39053cadc 100644
--- a/chrome/browser/managed_mode/permission_request_creator_sync.cc
+++ b/chrome/browser/supervised_user/permission_request_creator_sync.cc
@@ -2,21 +2,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/managed_mode/permission_request_creator_sync.h"
+#include "chrome/browser/supervised_user/permission_request_creator_sync.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/values.h"
-#include "chrome/browser/managed_mode/managed_user_settings_service.h"
-#include "chrome/browser/managed_mode/managed_user_shared_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_settings_service.h"
+#include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 #include "chrome/common/chrome_switches.h"
 
 using base::Time;
 
-const char kManagedUserAccessRequestKeyPrefix[] =
+const char kSupervisedUserAccessRequestKeyPrefix[] =
     "X-ManagedUser-AccessRequests";
-const char kManagedUserAccessRequestTime[] = "timestamp";
-const char kManagedUserName[] = "name";
+const char kSupervisedUserAccessRequestTime[] = "timestamp";
+const char kSupervisedUserName[] = "name";
 
 // Key for the notification setting of the custodian. This is a shared setting
 // so we can include the setting in the access request data that is used to
@@ -24,14 +24,14 @@ const char kManagedUserName[] = "name";
 const char kNotificationSetting[] = "custodian-notification-setting";
 
 PermissionRequestCreatorSync::PermissionRequestCreatorSync(
-    ManagedUserSettingsService* settings_service,
-    ManagedUserSharedSettingsService* shared_settings_service,
+    SupervisedUserSettingsService* settings_service,
+    SupervisedUserSharedSettingsService* shared_settings_service,
     const std::string& name,
-    const std::string& managed_user_id)
+    const std::string& supervised_user_id)
     : settings_service_(settings_service),
       shared_settings_service_(shared_settings_service),
       name_(name),
-      managed_user_id_(managed_user_id) {
+      supervised_user_id_(supervised_user_id) {
 }
 
 PermissionRequestCreatorSync::~PermissionRequestCreatorSync() {}
@@ -40,19 +40,20 @@ void PermissionRequestCreatorSync::CreatePermissionRequest(
     const std::string& url_requested,
     const base::Closure& callback) {
   // Add the prefix.
-  std::string key = ManagedUserSettingsService::MakeSplitSettingKey(
-      kManagedUserAccessRequestKeyPrefix, url_requested);
+  std::string key = SupervisedUserSettingsService::MakeSplitSettingKey(
+      kSupervisedUserAccessRequestKeyPrefix, url_requested);
 
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
 
   // TODO(sergiu): Use sane time here when it's ready.
-  dict->SetDouble(kManagedUserAccessRequestTime, base::Time::Now().ToJsTime());
+  dict->SetDouble(kSupervisedUserAccessRequestTime,
+                  base::Time::Now().ToJsTime());
 
-  dict->SetString(kManagedUserName, name_);
+  dict->SetString(kSupervisedUserName, name_);
 
   // Copy the notification setting of the custodian.
   const base::Value* value = shared_settings_service_->GetValue(
-      managed_user_id_, kNotificationSetting);
+      supervised_user_id_, kNotificationSetting);
   bool notifications_enabled = false;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableAccessRequestNotifications)) {