Deprecate prefs::kForceSessionSync

This pref was only used for legacy supervised users, based on
supervised_users::kRecordHistoryIncludesSessionSync. Legacy supervised
users don't exist anymore, so no need to keep this around.

Bug: none
Change-Id: I34a3661bba4e9ebc4e89677749f4c0ee001d908d
Reviewed-on: https://chromium-review.googlesource.com/c/1314492
Commit-Queue: Marc Treib <treib@chromium.org>
Reviewed-by: David Roger <droger@chromium.org>
Reviewed-by: Dominic Battré <battre@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606007}

chrome/browser/prefs/browser_prefs.cc

@@ -379,6 +379,7 @@ const char kReverseAutologinEnabled[] = "reverse_autologin.enabled";
 
 // Deprecated 11/2018.
 const char kNetworkQualities[] = "net.network_qualities";
+const char kForceSessionSync[] = "settings.history_recorded";
 
 // Register prefs used only for migration (clearing or moving to a new key).
 void RegisterProfilePrefsForMigration(
@@ -407,6 +408,7 @@ void RegisterProfilePrefsForMigration(
   registry->RegisterBooleanPref(kReverseAutologinEnabled, true);
 
   registry->RegisterDictionaryPref(kNetworkQualities, PrefRegistry::LOSSY_PREF);
+  registry->RegisterBooleanPref(kForceSessionSync, false);
 }
 
 }  // namespace
@@ -868,4 +870,5 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
 
   // Added 11/2018.
   profile_prefs->ClearPref(kNetworkQualities);
+  profile_prefs->ClearPref(kForceSessionSync);
 }

chrome/browser/profiles/profile_impl.cc

@@ -379,7 +379,6 @@ void ProfileImpl::RegisterProfilePrefs(
   registry->RegisterBooleanPref(prefs::kForceGoogleSafeSearch, false);
   registry->RegisterIntegerPref(prefs::kForceYouTubeRestrict,
                                 safe_search_util::YOUTUBE_RESTRICT_OFF);
-  registry->RegisterBooleanPref(prefs::kForceSessionSync, false);
   registry->RegisterStringPref(prefs::kAllowedDomainsForApps, std::string());
 
 #if defined(OS_ANDROID)

chrome/browser/supervised_user/child_accounts/child_account_service.cc

@@ -169,10 +169,6 @@ bool ChildAccountService::SetActive(bool active) {
     SupervisedUserSettingsService* settings_service =
         SupervisedUserSettingsServiceFactory::GetForProfile(profile_);
 
-    settings_service->SetLocalSetting(
-        supervised_users::kRecordHistoryIncludesSessionSync,
-        std::make_unique<base::Value>(false));
-
     // In contrast to legacy SUs, child account SUs must sign in.
     settings_service->SetLocalSetting(supervised_users::kSigninAllowed,
                                       std::make_unique<base::Value>(true));
@@ -215,8 +211,6 @@ bool ChildAccountService::SetActive(bool active) {
   } else {
     SupervisedUserSettingsService* settings_service =
         SupervisedUserSettingsServiceFactory::GetForProfile(profile_);
-    settings_service->SetLocalSetting(
-        supervised_users::kRecordHistoryIncludesSessionSync, nullptr);
     settings_service->SetLocalSetting(supervised_users::kSigninAllowed,
                                       nullptr);
     settings_service->SetLocalSetting(supervised_users::kCookiesAlwaysAllowed,

chrome/browser/supervised_user/supervised_user_constants.cc

@@ -21,8 +21,6 @@ const char kCookiesAlwaysAllowed[] = "CookiesAlwaysAllowed";
 const char kForceSafeSearch[] = "ForceSafeSearch";
 const char kGeolocationDisabled[] = "GeolocationDisabled";
 const char kRecordHistory[] = "RecordHistory";
-const char kRecordHistoryIncludesSessionSync[] =
-    "RecordHistoryIncludesSessionSync";
 const char kSafeSitesEnabled[] = "SafeSites";
 const char kSigninAllowed[] = "SigninAllowed";
 const char kUserName[] = "UserName";

chrome/browser/supervised_user/supervised_user_constants.h

@@ -22,7 +22,6 @@ extern const char kCookiesAlwaysAllowed[];
 extern const char kForceSafeSearch[];
 extern const char kGeolocationDisabled[];
 extern const char kRecordHistory[];
-extern const char kRecordHistoryIncludesSessionSync[];
 extern const char kSafeSitesEnabled[];
 extern const char kSigninAllowed[];
 extern const char kUserName[];

chrome/browser/supervised_user/supervised_user_pref_store.cc

@@ -148,13 +148,6 @@ void SupervisedUserPrefStore::OnNewSettingsAvailable(
       prefs_->SetInteger(prefs::kIncognitoModeAvailability,
                          record_history ? IncognitoModePrefs::DISABLED
                                         : IncognitoModePrefs::ENABLED);
-
-      bool record_history_includes_session_sync = true;
-      settings->GetBoolean(supervised_users::kRecordHistoryIncludesSessionSync,
-                           &record_history_includes_session_sync);
-      prefs_->SetBoolean(
-          prefs::kForceSessionSync,
-          record_history && record_history_includes_session_sync);
     }
 
     {

chrome/browser/supervised_user/supervised_user_service.cc

@@ -163,10 +163,6 @@ void SupervisedUserService::Init() {
       prefs::kSupervisedUserId,
       base::Bind(&SupervisedUserService::OnSupervisedUserIdChanged,
           base::Unretained(this)));
-  pref_change_registrar_.Add(
-      prefs::kForceSessionSync,
-      base::Bind(&SupervisedUserService::OnForceSessionSyncChanged,
-                 base::Unretained(this)));
 
   browser_sync::ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
@@ -353,13 +349,8 @@ void SupervisedUserService::SetSafeSearchURLReporter(
   url_reporter_ = std::move(reporter);
 }
 
-bool SupervisedUserService::IncludesSyncSessionsType() const {
-  return includes_sync_sessions_type_;
-}
-
 SupervisedUserService::SupervisedUserService(Profile* profile)
-    : includes_sync_sessions_type_(true),
-      profile_(profile),
+    : profile_(profile),
       active_(false),
       delegate_(NULL),
       is_profile_active_(false),
@@ -719,13 +710,6 @@ void SupervisedUserService::UpdateManualURLs() {
     observer.OnURLFilterChanged();
 }
 
-void SupervisedUserService::OnForceSessionSyncChanged() {
-  includes_sync_sessions_type_ =
-      profile_->GetPrefs()->GetBoolean(prefs::kForceSessionSync);
-  ProfileSyncServiceFactory::GetForProfile(profile_)
-      ->ReconfigureDatatypeManager(/*bypass_setup_in_progress_check=*/false);
-}
-
 void SupervisedUserService::Shutdown() {
   if (!did_init_)
     return;
@@ -1004,8 +988,6 @@ syncer::ModelTypeSet SupervisedUserService::GetPreferredDataTypes() const {
     return syncer::ModelTypeSet();
 
   syncer::ModelTypeSet result;
-  if (IncludesSyncSessionsType())
-    result.Put(syncer::SESSIONS);
   result.Put(syncer::EXTENSIONS);
   result.Put(syncer::EXTENSION_SETTINGS);
   result.Put(syncer::APPS);

chrome/browser/supervised_user/supervised_user_service.h

@@ -170,10 +170,6 @@ class SupervisedUserService : public KeyedService,
   void SetSafeSearchURLReporter(
       std::unique_ptr<SafeSearchURLReporter> reporter);
 
-  // Returns true if the syncer::SESSIONS type should be included in Sync.
-  // Public for testing.
-  bool IncludesSyncSessionsType() const;
-
   // ProfileKeyedService override:
   void Shutdown() override;
 
@@ -308,16 +304,6 @@ class SupervisedUserService : public KeyedService,
   // corresponding preference is changed.
   void UpdateManualURLs();
 
-  // Subscribes to the SupervisedUserPrefStore, refreshes
-  // |includes_sync_sessions_type_| and triggers reconfiguring the
-  // ProfileSyncService.
-  void OnForceSessionSyncChanged();
-
-  // The option a custodian sets to either record or prevent recording the
-  // supervised user's history. Set by |FetchNewSessionSyncState()| and
-  // defaults to true.
-  bool includes_sync_sessions_type_;
-
   // Owns us via the KeyedService mechanism.
   Profile* profile_;
 

chrome/browser/supervised_user/supervised_user_service_unittest.cc

@@ -214,13 +214,6 @@ class SupervisedUserServiceTest : public ::testing::Test {
 
 }  // namespace
 
-TEST_F(SupervisedUserServiceTest, ChangesIncludedSessionOnChangedSettings) {
-  supervised_user_service_->Init();
-  EXPECT_TRUE(supervised_user_service_->IncludesSyncSessionsType());
-  profile_->GetPrefs()->SetBoolean(prefs::kForceSessionSync, false);
-  EXPECT_FALSE(supervised_user_service_->IncludesSyncSessionsType());
-}
-
 #if !defined(OS_ANDROID)
 // Ensure that the CustodianProfileDownloaderService shuts down cleanly. If no
 // DCHECK is hit when the service is destroyed, this test passed.

chrome/common/pref_names.cc

@@ -914,10 +914,6 @@ const char kForceGoogleSafeSearch[] = "settings.force_google_safesearch";
 // YouTube. See |safe_search_util::YouTubeRestrictMode| for possible values.
 const char kForceYouTubeRestrict[] = "settings.force_youtube_restrict";
 
-// Boolean controlling whether history is recorded via Session Sync
-// (for supervised users).
-const char kForceSessionSync[] = "settings.history_recorded";
-
 // Comma separated list of domain names (e.g. "google.com,school.edu").
 // When this pref is set, the user will be able to access Google Apps
 // only using an account that belongs to one of the domains from this pref.

chrome/common/pref_names.h

@@ -293,7 +293,6 @@ extern const char kMdHistoryMenuPromoShown[];
 #endif
 extern const char kForceGoogleSafeSearch[];
 extern const char kForceYouTubeRestrict[];
-extern const char kForceSessionSync[];
 extern const char kAllowedDomainsForApps[];
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
 extern const char kUsesSystemTheme[];