| Index: chrome/browser/policy/configuration_policy_handler_list.cc
|
| diff --git a/chrome/browser/policy/configuration_policy_handler_list.cc b/chrome/browser/policy/configuration_policy_handler_list.cc
|
| index c11ca7347ff4a3645f2c96b8dbb1557e23e63762..b46454e7907a7bb681e301f39c57035a43eafda4 100644
|
| --- a/chrome/browser/policy/configuration_policy_handler_list.cc
|
| +++ b/chrome/browser/policy/configuration_policy_handler_list.cc
|
| @@ -337,21 +337,6 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
|
| { key::kVariationsRestrictParameter,
|
| prefs::kVariationsRestrictParameter,
|
| Value::TYPE_STRING },
|
| - { key::kContentPackDefaultFilteringBehavior,
|
| - prefs::kDefaultManagedModeFilteringBehavior,
|
| - Value::TYPE_INTEGER },
|
| - { key::kContentPackManualBehaviorHosts,
|
| - prefs::kManagedModeManualHosts,
|
| - Value::TYPE_DICTIONARY },
|
| - { key::kContentPackManualBehaviorURLs,
|
| - prefs::kManagedModeManualURLs,
|
| - Value::TYPE_DICTIONARY },
|
| - // TODO(ibraaaa): Remove this when we finish moving
|
| - // managed user settings out of the policy code.
|
| - // http://crbug.com/280674
|
| - { key::kUserDisplayName,
|
| - prefs::kProfileName,
|
| - Value::TYPE_STRING },
|
| { key::kSupervisedUserCreationEnabled,
|
| prefs::kManagedUserCreationAllowed,
|
| Value::TYPE_BOOLEAN },
|
|
|