Supervised Users: Replace kForceSafeSearch pref with kForceGoogleSearch and kForceYouTubeSafetyMode.

chrome/browser/supervised_user/supervised_user_service_browsertest.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 "base/callback.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 63 matching lines @@
       base::Bind(&TestAuthErrorCallback),
       profile,
       GoogleServiceAuthError(GoogleServiceAuthError::NONE),
       std::string("abcdef"));
   EXPECT_FALSE(cache.IsOmittedProfileAtIndex(index));
 }
 
 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_TRUE(prefs->IsUserModifiablePreference(prefs::kForceGoogleSafeSearch));

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

And if you feel like it, here (and below) also.

 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTest, ProfileName) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
   EXPECT_TRUE(prefs->IsUserModifiablePreference(prefs::kProfileName));
 
   std::string original_name = prefs->GetString(prefs::kProfileName);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(original_name,
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 }
 
 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_FALSE(
+      prefs->IsUserModifiablePreference(prefs::kForceGoogleSafeSearch));
 }
 
 IN_PROC_BROWSER_TEST_F(SupervisedUserServiceTestSupervised, ProfileName) {
   Profile* profile = browser()->profile();
   PrefService* prefs = profile->GetPrefs();
   std::string original_name = prefs->GetString(prefs::kProfileName);
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   const ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
 
   SupervisedUserSettingsService* settings =
@@ skipping 20 matching lines @@
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 
   // Remove the setting.
   settings->SetLocalSetting(supervised_users::kUserName,
                             scoped_ptr<base::Value>());
   EXPECT_EQ(original_name, prefs->GetString(prefs::kProfileName));
   profile_index = cache.GetIndexOfProfileWithPath(profile->GetPath());
   EXPECT_EQ(original_name,
             base::UTF16ToUTF8(cache.GetNameOfProfileAtIndex(profile_index)));
 }