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),
+    : may_session_sync_(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 (MaySyncSessions())
+    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::OnNewSettingsAvailable(
+      const base::DictionaryValue* settings) {

[Marc Treib, 2014/08/19 14:00:27]

Indent 4 spaces only. You can also try "git cl format".

+  bool has_session_sync_state_changed = FetchNewSessionSyncState(settings);
+  if (has_session_sync_state_changed) {
+    ReinitializeProfileSyncService();
+  }
+}
+
+bool SupervisedUserService::FetchNewSessionSyncState(
+      const base::DictionaryValue* settings) {

[Marc Treib, 2014/08/19 14:00:27]

^^

+  bool old_may_session_sync_ = may_session_sync_;

[Marc Treib, 2014/08/19 14:00:27]

No trailing underscore on local variable.

+  const base::Value* value = NULL;
+  if (settings &&

[Marc Treib, 2014/08/19 14:00:27]

Can settings be null here? If so, please add a comment when this can happen.

+      settings->GetWithoutPathExpansion(supervised_users::kRecordHistory,
+                                        &value))
+    value->GetAsBoolean(&may_session_sync_);
+  return old_may_session_sync_ != may_session_sync_;
+}
+
+void SupervisedUserService::ReinitializeProfileSyncService() {
+  ProfileSyncService* sync_service =
+      ProfileSyncServiceFactory::GetForProfile(profile_);
+  if (!sync_service->sync_initialized())

[Marc Treib, 2014/08/19 14:00:27]

Also check sync_service->setup_in_progress() ?

+    return;
+  // The following lines force the ProfileSyncService to reload its changed data
+  sync_service->SetSetupInProgress(true);
+  sync_service->SetSetupInProgress(false);
+}
+
+bool SupervisedUserService::MaySyncSessions() const {
+  return may_session_sync_;
+}
+
 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 268 matching lines @@
   // Re-set the default theme to turn the SU theme on/off.
   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile_);
   if (theme_service->UsingDefaultTheme() || theme_service->UsingSystemTheme()) {
     ThemeServiceFactory::GetForProfile(profile_)->UseDefaultTheme();
   }
 #endif
 
   SupervisedUserSettingsService* settings_service = GetSettingsService();
   settings_service->SetActive(active_);
 
+  settings_service->Subscribe(
+      base::Bind(&SupervisedUserService::OnNewSettingsAvailable,
+                 weak_ptr_factory_.GetWeakPtr()));
+
 #if defined(ENABLE_EXTENSIONS)
   SetExtensionsActive();
 #endif
 
   if (active_) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kPermissionRequestApiUrl)) {
       permissions_creator_ =
           PermissionRequestCreatorApiary::CreateWithProfile(profile_);
     } else {
@@ skipping 149 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
 }