Added a ForceYouTubeRestrict policy and deprecated the old ForceYouTubeSafetyMode policy

chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
index f25f7366129c98f054ebf3b10637ce5fb2f1c8cd..70adeb3326f49bd7ac89f764551789db2c4684a4 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
@@ -7,6 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
+#include "chrome/browser/net/safe_search_util.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_pref_store.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
@@ -113,16 +114,16 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   EXPECT_FALSE(fixture.changed_prefs()->GetDictionary(
       prefs::kSupervisedUserManualHosts, &manual_hosts));
 
-  // kForceGoogleSafeSearch and kForceYouTubeSafetyMode default to true for
-  // supervised users.
+  // kForceGoogleSafeSearch defaults to true and kForceYouTubeRestrict

[Marc Treib, 2016/09/05 09:58:11]

So, Restrict=Moderate results in the same behavior as the old SafetyMode=true?

[ljusten (tachyonic), 2016/09/05 15:24:32]

Correct.

+  // defaults to Moderate for supervised users.
   bool force_google_safesearch = false;
-  bool force_youtube_safety_mode = false;
+  int force_youtube_restrict = safe_search_util::YOUTUBE_OFF;
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceGoogleSafeSearch,
                                                   &force_google_safesearch));
-  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(
-      prefs::kForceYouTubeSafetyMode, &force_youtube_safety_mode));
+  EXPECT_TRUE(fixture.changed_prefs()->GetInteger(prefs::kForceYouTubeRestrict,
+                                                  &force_youtube_restrict));
   EXPECT_TRUE(force_google_safesearch);
-  EXPECT_TRUE(force_youtube_safety_mode);
+  EXPECT_EQ(force_youtube_restrict, safe_search_util::YOUTUBE_MODERATE);
 
   // Activating the service again should not change anything.
   fixture.changed_prefs()->Clear();
@@ -140,7 +141,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
       prefs::kSupervisedUserManualHosts, &manual_hosts));
   EXPECT_TRUE(manual_hosts->Equals(dict.get()));
 
-  // kForceGoogleSafeSearch and kForceYouTubeSafetyMode can be configured by the
+  // kForceGoogleSafeSearch and kForceYouTubeRestrict can be configured by the
   // custodian, overriding the hardcoded default.
   fixture.changed_prefs()->Clear();
   service_.SetLocalSetting(
@@ -149,10 +150,10 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   EXPECT_EQ(1u, fixture.changed_prefs()->size());
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceGoogleSafeSearch,
                                                   &force_google_safesearch));
-  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(
-      prefs::kForceYouTubeSafetyMode, &force_youtube_safety_mode));
-  EXPECT_FALSE(force_youtube_safety_mode);
+  EXPECT_TRUE(fixture.changed_prefs()->GetInteger(prefs::kForceYouTubeRestrict,
+                                                  &force_youtube_restrict));
   EXPECT_FALSE(force_google_safesearch);
+  EXPECT_EQ(force_youtube_restrict, safe_search_util::YOUTUBE_OFF);
 }
 
 TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {