Supervised Users: Replace kForceSafeSearch pref with kForceGoogleSearch and kForceYouTubeSafetyMode.

BUG=458546

Review URL: https://codereview.chromium.org/924033002

Cr-Commit-Position: refs/heads/master@{#317564}

3 files changed, 35 insertions, 16 deletions

diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc
index 40a5302..7eba256 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -40,7 +40,10 @@ SupervisedUserSettingsPrefMappingEntry kSupervisedUserSettingsPrefMapping[] = {
     prefs::kSupervisedUserManualURLs,
   },
   {
-    supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
+    supervised_users::kForceSafeSearch, prefs::kForceGoogleSafeSearch,
+  },
+  {
+    supervised_users::kForceSafeSearch, prefs::kForceYouTubeSafetyMode,
   },
   {
     supervised_users::kRecordHistory, prefs::kRecordHistory,
@@ -100,7 +103,8 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
     prefs_->SetBoolean(prefs::kAllowDeletingBrowserHistory, false);
     prefs_->SetInteger(prefs::kDefaultSupervisedUserFilteringBehavior,
                        SupervisedUserURLFilter::ALLOW);
-    prefs_->SetBoolean(prefs::kForceSafeSearch, true);
+    prefs_->SetBoolean(prefs::kForceGoogleSafeSearch, true);
+    prefs_->SetBoolean(prefs::kForceYouTubeSafetyMode, true);
     prefs_->SetBoolean(prefs::kHideWebStoreIcon, true);
     prefs_->SetInteger(prefs::kIncognitoModeAvailability,
                        IncognitoModePrefs::DISABLED);
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 490b226..28cc8b0 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
@@ -112,11 +112,16 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   EXPECT_FALSE(fixture.changed_prefs()->GetDictionary(
       prefs::kSupervisedUserManualHosts, &manual_hosts));
 
-  // kForceSafeSearch defaults to true for supervised users.
-  bool force_safesearch = false;
-  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
-                                                  &force_safesearch));
-  EXPECT_TRUE(force_safesearch);
+  // kForceGoogleSafeSearch and kForceYouTubeSafetyMode default to true for
+  // supervised users.
+  bool force_google_safesearch = false;
+  bool force_youtube_safety_mode = false;
+  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(force_google_safesearch);
+  EXPECT_TRUE(force_youtube_safety_mode);
 
   // Activating the service again should not change anything.
   fixture.changed_prefs()->Clear();
@@ -135,16 +140,19 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
       prefs::kSupervisedUserManualHosts, &manual_hosts));
   EXPECT_TRUE(manual_hosts->Equals(dict.get()));
 
-  // kForceSafeSearch can be configured by the custodian, overriding the
-  // hardcoded default.
+  // kForceGoogleSafeSearch and kForceYouTubeSafetyMode can be configured by the
+  // custodian, overriding the hardcoded default.
   fixture.changed_prefs()->Clear();
   service_.SetLocalSetting(
       supervised_users::kForceSafeSearch,
       scoped_ptr<base::Value>(new base::FundamentalValue(false)));
   EXPECT_EQ(1u, fixture.changed_prefs()->size());
-  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
-                                                  &force_safesearch));
-  EXPECT_FALSE(force_safesearch);
+  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_FALSE(force_google_safesearch);
 }
 
 TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {
diff --git a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
index 7020fa9..837657e 100644
--- a/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_browsertest.cc
@@ -81,8 +81,11 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTest,
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTest, LocalPolicies) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
-  EXPECT_FALSE(prefs->GetBoolean(prefs::kForceSafeSearch));
-  EXPECT_TRUE(prefs->IsUserModifiablePreference(prefs::kForceSafeSearch));
+  EXPECT_FALSE(prefs->GetBoolean(prefs::kForceGoogleSafeSearch));
+  EXPECT_FALSE(prefs->GetBoolean(prefs::kForceYouTubeSafetyMode));
+  EXPECT_TRUE(prefs->IsUserModifiablePreference(prefs::kForceGoogleSafeSearch));
+  EXPECT_TRUE(
+      prefs->IsUserModifiablePreference(prefs::kForceYouTubeSafetyMode));
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTest, ProfileName) {
@@ -101,8 +104,12 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTest, ProfileName) {
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, LocalPolicies) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
-  EXPECT_TRUE(prefs->GetBoolean(prefs::kForceSafeSearch));
-  EXPECT_FALSE(prefs->IsUserModifiablePreference(prefs::kForceSafeSearch));
+  EXPECT_TRUE(prefs->GetBoolean(prefs::kForceGoogleSafeSearch));
+  EXPECT_TRUE(prefs->GetBoolean(prefs::kForceYouTubeSafetyMode));
+  EXPECT_FALSE(
+      prefs->IsUserModifiablePreference(prefs::kForceGoogleSafeSearch));
+  EXPECT_FALSE(
+      prefs->IsUserModifiablePreference(prefs::kForceYouTubeSafetyMode));
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, ProfileName) {