Supervised Users: Replace kForceSafeSearch pref with kForceGoogleSearch and kForceYouTubeSafetyMode.

chrome/browser/supervised_user/supervised_user_pref_store.cc

 // Copyright 2014 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/supervised_user/supervised_user_pref_store.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 22 matching lines @@
   },
   {
     supervised_users::kContentPackManualBehaviorHosts,
     prefs::kSupervisedUserManualHosts,
   },
   {
     supervised_users::kContentPackManualBehaviorURLs,
     prefs::kSupervisedUserManualURLs,
   },
   {
-    supervised_users::kForceSafeSearch, prefs::kForceSafeSearch,
+    supervised_users::kForceSafeSearch, prefs::kForceGoogleSafeSearch,
+  },
+  {
+    supervised_users::kForceSafeSearch, prefs::kForceYouTubeSafetyMode,
   },
   {
     supervised_users::kRecordHistory, prefs::kRecordHistory,
   },
   {
     supervised_users::kSigninAllowed, prefs::kSigninAllowed,
   },
   {
     supervised_users::kUserName, prefs::kProfileName,
   },
@@ skipping 39 matching lines @@
 
 void SupervisedUserPrefStore::OnNewSettingsAvailable(
     const base::DictionaryValue* settings) {
   scoped_ptr<PrefValueMap> old_prefs = prefs_.Pass();
   prefs_.reset(new PrefValueMap);
   if (settings) {
     // Set hardcoded prefs and defaults.
     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);
     prefs_->SetBoolean(prefs::kRecordHistory, true);
     prefs_->SetBoolean(prefs::kSigninAllowed, false);
 
     // Copy supervised user settings to prefs.
     for (const auto& entry : kSupervisedUserSettingsPrefMapping) {
       const base::Value* value = NULL;
       if (settings->GetWithoutPathExpansion(entry.settings_name, &value))
@@ skipping 26 matching lines @@
   }
 
   std::vector<std::string> changed_prefs;
   prefs_->GetDifferingKeys(old_prefs.get(), &changed_prefs);
 
   // Send out change notifications.
   for (const std::string& pref : changed_prefs) {
     FOR_EACH_OBSERVER(Observer, observers_, OnPrefValueChanged(pref));
   }
 }