Move SafeSites policy pref to //components/policy

The pref for the Safe Sites filter, kSafeSitesFilterBehavior, should be
accessible from //components/policy, where the filter itself will check
it once implemented.

Note that this policy's pref is unused until the follow-up CL.

Bug: 819405
Change-Id: If87877488067ee008f16d2dc848f5e2ab01de25f
Reviewed-on: https://chromium-review.googlesource.com/1117877Reviewed-by: Ramin Halavati <rhalavati@chromium.org>
Reviewed-by: Julian Pastarmov <pastarmovj@chromium.org>
Commit-Queue: Michael Giuffrida <michaelpg@chromium.org>
Cr-Commit-Position: refs/heads/master@{#579331}

chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -306,7 +306,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = {
     prefs::kPasswordProtectionChangePasswordURL,
     base::Value::Type::STRING},
   { key::kSafeSitesFilterBehavior,
-    prefs::kSafeSitesFilterBehavior,
+    policy_prefs::kSafeSitesFilterBehavior,
     base::Value::Type::INTEGER},
 #if defined(OS_POSIX)
   { key::kNtlmV2Enabled,

chrome/browser/prefs/pref_service_incognito_whitelist.cc

@@ -231,7 +231,6 @@ const char* incognito_whitelist[] = {
 #endif
     prefs::kForceGoogleSafeSearch, prefs::kForceYouTubeRestrict,
     prefs::kForceSessionSync, prefs::kAllowedDomainsForApps,
-    prefs::kSafeSitesFilterBehavior,
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
     prefs::kUsesSystemTheme,
 #endif

chrome/common/pref_names.cc

@@ -915,10 +915,6 @@ const char kForceSessionSync[] = "settings.history_recorded";
 // only using an account that belongs to one of the domains from this pref.
 const char kAllowedDomainsForApps[] = "settings.allowed_domains_for_apps";
 
-// Enum specifying if/how the safesites content filter should be applied.
-// See the SafeSitesFilterBehavior policy for details.
-const char kSafeSitesFilterBehavior[] = "settings.safe_sites_filter_behavior";
-
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 // Linux specific preference on whether we should match the system theme.
 const char kUsesSystemTheme[] = "extensions.theme.use_system";

chrome/common/pref_names.h

@@ -294,7 +294,6 @@ extern const char kForceGoogleSafeSearch[];
 extern const char kForceYouTubeRestrict[];
 extern const char kForceSessionSync[];
 extern const char kAllowedDomainsForApps[];
-extern const char kSafeSitesFilterBehavior[];
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 extern const char kUsesSystemTheme[];
 #endif

components/policy/core/common/policy_pref_names.cc

@@ -11,6 +11,14 @@ namespace policy_prefs {
 // by UMA_HISTOGRAM_ENUMERATION.
 const char kLastPolicyStatisticsUpdate[] = "policy.last_statistics_update";
 
+// The enrollment token of machine level user cloud policy.
+const char kMachineLevelUserCloudPolicyEnrollmentToken[] =
+    "policy.machine_level_user_cloud_policy_enrollment_token";
+
+// Enum specifying if/how the SafeSites content filter should be applied.
+// See the SafeSitesFilterBehavior policy for details.
+const char kSafeSitesFilterBehavior[] = "policy.safe_sites_filter_behavior";
+
 // Blocks access to the listed host patterns.
 const char kUrlBlacklist[] = "policy.url_blacklist";
 
@@ -22,9 +30,5 @@ const char kUrlWhitelist[] = "policy.url_whitelist";
 // by the cloud policy subsystem.
 const char kUserPolicyRefreshRate[] = "policy.user_refresh_rate";
 
-// The enrollment token of machine level user cloud policy
-const char kMachineLevelUserCloudPolicyEnrollmentToken[] =
-    "policy.machine_level_user_cloud_policy_enrollment_token";
-
 }  // namespace policy_prefs
 }  // namespace policy

components/policy/core/common/policy_pref_names.h

@@ -11,10 +11,12 @@ namespace policy {
 namespace policy_prefs {
 
 POLICY_EXPORT extern const char kLastPolicyStatisticsUpdate[];
+POLICY_EXPORT extern const char kMachineLevelUserCloudPolicyEnrollmentToken[];
+POLICY_EXPORT extern const char kSafeSitesFilterBehavior[];
 POLICY_EXPORT extern const char kUrlBlacklist[];
 POLICY_EXPORT extern const char kUrlWhitelist[];
 POLICY_EXPORT extern const char kUserPolicyRefreshRate[];
-POLICY_EXPORT extern const char kMachineLevelUserCloudPolicyEnrollmentToken[];
+
 }  // namespace policy_prefs
 }  // namespace policy