Stopping the history recording for a supervised user

chrome/browser/supervised_user/supervised_user_service.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_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 114 matching lines @@
     scoped_ptr<std::map<GURL, bool> > url_map) {
   ui_url_filter_->SetManualURLs(url_map.get());
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&SupervisedUserURLFilter::SetManualURLs,
                  io_url_filter_, base::Owned(url_map.release())));
 }
 
 SupervisedUserService::SupervisedUserService(Profile* profile)
-    : profile_(profile),
+    : includes_sync_sessions_(true),
+      profile_(profile),
       active_(false),
       delegate_(NULL),
 #if defined(ENABLE_EXTENSIONS)
       extension_registry_observer_(this),
 #endif
       waiting_for_sync_initialization_(false),
       is_profile_active_(false),
       elevated_for_testing_(false),
       did_init_(false),
       did_shutdown_(false),
@@ skipping 206 matching lines @@
     UpdateSiteLists();
   }
 }
 #endif  // defined(ENABLE_EXTENSIONS)
 
 syncer::ModelTypeSet SupervisedUserService::GetPreferredDataTypes() const {
   if (!ProfileIsSupervised())
     return syncer::ModelTypeSet();
 
   syncer::ModelTypeSet result;
-  result.Put(syncer::SESSIONS);
+  if (IncludesSyncSessions())
+    result.Put(syncer::SESSIONS);
   result.Put(syncer::EXTENSIONS);
   result.Put(syncer::EXTENSION_SETTINGS);
   result.Put(syncer::APPS);
   result.Put(syncer::APP_SETTINGS);
   result.Put(syncer::APP_NOTIFICATIONS);
   result.Put(syncer::APP_LIST);
   return result;
 }
 
+void SupervisedUserService::OnHistoryRecordingStateChanged() {
+  bool has_session_sync_state_changed = FetchNewSessionSyncState();
+  if (has_session_sync_state_changed)
+    ProfileSyncServiceFactory::GetForProfile(profile_)
+        ->ReconfigureDatatypeManager();
+}
+
+bool SupervisedUserService::FetchNewSessionSyncState() {

[Marc Treib, 2014/08/20 14:14:26]

This method doesn't seem necessary anymore, since your callback will only be
called when the value actually changed.

[fhorschig, 2014/08/20 14:48:03]

Done.

+  bool old_includes_session_sync = includes_sync_sessions_;
+
+  includes_sync_sessions_ =
+      profile_->GetPrefs()->GetBoolean(prefs::kRecordHistory);
+
+  return old_includes_session_sync != includes_sync_sessions_;
+}
+
+bool SupervisedUserService::IncludesSyncSessions() const {
+  return includes_sync_sessions_;
+}
+
 void SupervisedUserService::OnStateChanged() {
   ProfileSyncService* service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   if (waiting_for_sync_initialization_ && service->sync_initialized()) {
     waiting_for_sync_initialization_ = false;
     service->RemoveObserver(this);
     FinishSetupSync();
     return;
   }
 
@@ skipping 219 matching lines @@
 void SupervisedUserService::Init() {
   DCHECK(!did_init_);
   did_init_ = true;
   DCHECK(GetSettingsService()->IsReady());
 
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(
       prefs::kSupervisedUserId,
       base::Bind(&SupervisedUserService::OnSupervisedUserIdChanged,
           base::Unretained(this)));
+  pref_change_registrar_.Add(
+      prefs::kRecordHistory,
+      base::Bind(&SupervisedUserService::OnHistoryRecordingStateChanged,
+                 base::Unretained(this)));
 
   ProfileSyncService* sync_service =
       ProfileSyncServiceFactory::GetForProfile(profile_);
   // Can be null in tests.
   if (sync_service)
     sync_service->AddPreferenceProvider(this);
 
   SetActive(ProfileIsSupervised());
 }
 
@@ skipping 198 matching lines @@
   // The active user can be NULL in unit tests.
   if (chromeos::UserManager::Get()->GetActiveUser()) {
     return UTF16ToUTF8(chromeos::UserManager::Get()->GetUserDisplayName(
         chromeos::UserManager::Get()->GetActiveUser()->GetUserID()));
   }
   return std::string();
 #else
   return profile_->GetPrefs()->GetString(prefs::kProfileName);
 #endif
 }