Supervised user SafeSites: Add a field trial to turn on/off

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index c452036fb5d6b8f84a0fc66e04e3afdef5dfdabd..61a7647298b6126f522b7d3f73c1a25b557bda5d 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -354,14 +354,6 @@ const char kDisableSessionCrashedBubble[] = "disable-session-crashed-bubble";
 // Disables the suggestions service.
 const char kDisableSuggestionsService[]     = "disable-suggestions-service";
 
-// Disables the supervised user host blacklist.
-const char kDisableSupervisedUserBlacklist[] =
-    "disable-supervised-user-blacklist";
-
-// Disables SafeSites filtering for supervised users.
-const char kDisableSupervisedUserSafeSites[] =
-    "disable-supervised-user-safesites";
-
 // Disables syncing browser data to a Google Account.
 const char kDisableSync[]                   = "disable-sync";
 
@@ -575,18 +567,10 @@ const char kEnableSpdy4[]                   = "enable-spdy4";
 // Enables the suggestions service.
 const char kEnableSuggestionsService[]      = "enable-suggestions-service";
 
-// Enables the supervised user host blacklist.
-const char kEnableSupervisedUserBlacklist[] =
-    "enable-supervised-user-blacklist";
-
 // Enables the supervised user managed bookmarks folder.
 const char kEnableSupervisedUserManagedBookmarksFolder[] =
     "enable-supervised-user-managed-bookmarks-folder";
 
-// Enables SafeSites filtering for supervised users.
-const char kEnableSupervisedUserSafeSites[] =
-    "enable-supervised-user-safesites";
-
 // Enables synced articles.
 const char kEnableSyncArticles[]            = "enable-sync-articles";
 
@@ -1126,6 +1110,10 @@ const char kStartMaximized[]                = "start-maximized";
 // Used for testing.
 const char kSupervisedUserId[]              = "managed-user-id";
 
+// Enables/disables SafeSites filtering for supervised users. Possible values
+// are "enabled", "disabled", "blacklist-only", and "online-check-only".
+const char kSupervisedUserSafeSites[]       = "supervised-user-safesites";
+
 // Used to authenticate requests to the Sync service for supervised users.
 // Setting this switch also causes Sync to be set up for a supervised user.
 const char kSupervisedUserSyncToken[]       = "managed-user-sync-token";