Supervised Users: Replace kForceSafeSearch pref with kForceGoogleSearch and kForceYouTubeSafetyMode.

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 490b2261e3e46ea05fe12e34fca48cb85248d043..e2a36a42db42acf04de26b8c61fb443b2d605d03 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store_unittest.cc
@@ -112,9 +112,9 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
   EXPECT_FALSE(fixture.changed_prefs()->GetDictionary(
       prefs::kSupervisedUserManualHosts, &manual_hosts));
 
-  // kForceSafeSearch defaults to true for supervised users.
+  // kForceGoogleSafeSearch defaults to true for supervised users.
   bool force_safesearch = false;
-  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceSafeSearch,
+  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceGoogleSafeSearch,
                                                   &force_safesearch));
   EXPECT_TRUE(force_safesearch);

[Marc Treib, 2015/02/23 09:08:39]

Also add a check for kForceYouTubeSafetyMode?

 
@@ -135,14 +135,14 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
       prefs::kSupervisedUserManualHosts, &manual_hosts));
   EXPECT_TRUE(manual_hosts->Equals(dict.get()));
 
-  // kForceSafeSearch can be configured by the custodian, overriding the
+  // kForceGoogleSafeSearch 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,
+  EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(prefs::kForceGoogleSafeSearch,
                                                   &force_safesearch));
   EXPECT_FALSE(force_safesearch);

[Marc Treib, 2015/02/23 09:08:39]

Here too.

 }