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

chrome/browser/about_flags.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 420 matching lines @@
   { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
     chromeos::switches::kDisableDataSaverPrompt, "" },
   { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
     chromeos::switches::kEnableDataSaverPrompt, "" },
   { IDS_FLAGS_DATASAVER_PROMPT_DEMO_MODE,
     chromeos::switches::kEnableDataSaverPrompt,
     chromeos::switches::kDataSaverPromptDemoMode },
 };
 #endif
 
+const Experiment::Choice kSupervisedUserSafeSitesChoices[] = {
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
+    switches::kSupervisedUserSafeSites,
+    "enabled" },
+  { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
+    switches::kSupervisedUserSafeSites,
+    "disabled" },
+  { IDS_SUPERVISED_USER_SAFESITES_BLACKLIST_ONLY,
+    switches::kSupervisedUserSafeSites,
+    "blacklist-only" },
+  { IDS_SUPERVISED_USER_SAFESITES_ONLINE_CHECK_ONLY,
+    switches::kSupervisedUserSafeSites,
+    "online-check-only" }
+};
+
 // RECORDING USER METRICS FOR FLAGS:
 // -----------------------------------------------------------------------------
 // The first line of the experiment is the internal name. If you'd like to
 // gather statistics about the usage of your flag, you should append a marker
 // comment to the end of the feature name, like so:
 //   "my-special-feature",  // FLAGS:RECORD_UMA
 //
 // After doing that, run
 //   tools/metrics/actions/extract_actions.py
 // to add the metric to actions.xml (which will enable UMA to record your
@@ skipping 739 matching lines @@
   },
   {
     "enable-suggestions-service",
     IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_NAME,
     IDS_FLAGS_ENABLE_SUGGESTIONS_SERVICE_DESCRIPTION,
     kOsAndroid | kOsCrOS,
     ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSuggestionsService,
                               switches::kDisableSuggestionsService)
   },
   {
-    "enable-supervised-user-blacklist",
-    IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_NAME,
-    IDS_FLAGS_ENABLE_SUPERVISED_USER_BLACKLIST_DESCRIPTION,
-    kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserBlacklist,
-                              switches::kDisableSupervisedUserBlacklist)
-  },
-  {
     "enable-supervised-user-managed-bookmarks-folder",
     IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_NAME,
     IDS_FLAGS_ENABLE_SUPERVISED_USER_MANAGED_BOOKMARKS_FOLDER_DESCRIPTION,
     kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
     SINGLE_VALUE_TYPE(switches::kEnableSupervisedUserManagedBookmarksFolder)
   },
-  {
-    "enable-supervised-user-safesites",
-    IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_NAME,
-    IDS_FLAGS_ENABLE_SUPERVISED_USER_SAFESITES_DESCRIPTION,
-    kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
-    ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSupervisedUserSafeSites,
-                              switches::kDisableSupervisedUserSafeSites)
-  },
 #if defined(ENABLE_APP_LIST)
   {
     "enable-sync-app-list",
     IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME,
     IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION,
     kOsDesktop,
     ENABLE_DISABLE_VALUE_TYPE(app_list::switches::kEnableSyncAppList,
                               app_list::switches::kDisableSyncAppList)
   },
 #endif
@@ skipping 1102 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 #if defined(OS_CHROMEOS)
   {
     "enable-datasaver-prompt",
     IDS_FLAGS_DATASAVER_PROMPT_NAME,
     IDS_FLAGS_DATASAVER_PROMPT_DESCRIPTION,
     kOsCrOS,
     MULTI_VALUE_TYPE(kDataSaverPromptChoices)
   },
 #endif  // defined(OS_CHROMEOS)
+  {
+    "supervised-user-safesites",
+    IDS_FLAGS_SUPERVISED_USER_SAFESITES_NAME,
+    IDS_FLAGS_SUPERVISED_USER_SAFESITES_DESCRIPTION,
+    kOsAndroid | kOsMac | kOsWin | kOsLinux | kOsCrOS,
+    MULTI_VALUE_TYPE(kSupervisedUserSafeSitesChoices)
+  },
   // NOTE: Adding new command-line switches requires adding corresponding
   // entries to enum "LoginCustomFlags" in histograms.xml. See note in
   // histograms.xml and don't forget to run AboutFlagsHistogramTest unit test.
 };
 
 const Experiment* experiments = kExperiments;
 size_t num_experiments = arraysize(kExperiments);
 
 // Stores and encapsulates the little state that about:flags has.
 class FlagsState {
@@ skipping 568 matching lines @@
 }
 
 const Experiment* GetExperiments(size_t* count) {
   *count = num_experiments;
   return experiments;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags