Supervised Users: Replace kForceSafeSearch pref with kForceGoogleSearch and kForceYouTubeSafetyMode.

chrome/browser/supervised_user/supervised_user_pref_store_unittest.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 <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
@@ skipping 94 matching lines @@
   bool allow_deleting_browser_history = true;
   EXPECT_TRUE(fixture.changed_prefs()->GetBoolean(
       prefs::kAllowDeletingBrowserHistory, &allow_deleting_browser_history));
   EXPECT_FALSE(allow_deleting_browser_history);
 
   // kSupervisedModeManualHosts does not have a hardcoded value.
   base::DictionaryValue* manual_hosts = NULL;
   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?

 
   // Activating the service again should not change anything.
   fixture.changed_prefs()->Clear();
   service_.SetActive(true);
   EXPECT_EQ(0u, fixture.changed_prefs()->size());
 
   // kSupervisedModeManualHosts can be configured by the custodian.
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue);
   dict->SetBoolean("example.com", true);
   dict->SetBoolean("moose.org", false);
   service_.SetLocalSetting(
       supervised_users::kContentPackManualBehaviorHosts,
       scoped_ptr<base::Value>(dict->DeepCopy()));
   EXPECT_EQ(1u, fixture.changed_prefs()->size());
   ASSERT_TRUE(fixture.changed_prefs()->GetDictionary(
       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.

 }
 
 TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {
   SupervisedUserPrefStoreFixture fixture(&service_);
   EXPECT_FALSE(fixture.initialization_completed());
 
   service_.SetActive(true);
   EXPECT_FALSE(fixture.initialization_completed());
   EXPECT_EQ(0u, fixture.changed_prefs()->size());
 
   pref_store_->SetInitializationCompleted();
   EXPECT_TRUE(fixture.initialization_completed());
   EXPECT_EQ(0u, fixture.changed_prefs()->size());
 }
 
 TEST_F(SupervisedUserPrefStoreTest, CreatePrefStoreAfterInitialization) {
   pref_store_->SetInitializationCompleted();
   service_.SetActive(true);
 
   SupervisedUserPrefStoreFixture fixture(&service_);
   EXPECT_TRUE(fixture.initialization_completed());
   EXPECT_EQ(0u, fixture.changed_prefs()->size());
 }