Stopping the history recording for a supervised user

chrome/browser/supervised_user/supervised_user_service_unittest.cc

Index: chrome/browser/supervised_user/supervised_user_service_unittest.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service_unittest.cc b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
index bc68d836c399d1ecf61b0b6d6cd4b9a048587eb8..f2ae3a362629603717c864ed4c36950c761e9acf 100644
--- a/chrome/browser/supervised_user/supervised_user_service_unittest.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_unittest.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/supervised_user/custodian_profile_downloader_service.h"
 #include "chrome/browser/supervised_user/custodian_profile_downloader_service_factory.h"
+#include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -154,6 +155,26 @@ TEST_F(SupervisedUserServiceTest, GetManualExceptionsForHost) {
             supervised_user_service_->GetManualBehaviorForURL(kMooseURL));
 }
 
+TEST_F(SupervisedUserServiceTest, ChangesIncludedSessionOnChangedSettings) {
+  base::DictionaryValue* dict = new base::DictionaryValue();

[Marc Treib, 2014/08/19 15:28:02]

Memleak! Use a scoped_ptr or an instance variable.

[fhorschig, 2014/08/20 11:59:30]

Done.

+  dict->SetBooleanWithoutPathExpansion(supervised_users::kRecordHistory, false);
+
+  supervised_user_service_->OnNewSettingsAvailable(dict);
+
+  EXPECT_FALSE(supervised_user_service_->IncludesSyncSessions());

[Marc Treib, 2014/08/19 15:28:02]

Also check that it was true before OnNewSettingsAvailable. (Or maybe add another
OnNewSettingsAvailable call with RecordHistory set to true, if you don't want to
test the default value.)

[fhorschig, 2014/08/20 11:59:30]

Done.

+}
+
+TEST_F(SupervisedUserServiceTest, ChangesSyncSessionStateOnChangedSettings) {
+  base::DictionaryValue* dict = new base::DictionaryValue();
+  dict->SetBooleanWithoutPathExpansion(supervised_users::kRecordHistory, false);
+  supervised_user_service_->OnNewSettingsAvailable(dict);
+  dict->SetBooleanWithoutPathExpansion(supervised_users::kRecordHistory, true);
+
+  bool changed_state = supervised_user_service_->FetchNewSessionSyncState(dict);
+
+  EXPECT_TRUE(changed_state);
+}
+
 // Ensure that the CustodianProfileDownloaderService shuts down cleanly. If no
 // DCHECK is hit when the service is destroyed, this test passed.
 TEST_F(SupervisedUserServiceTest, ShutDownCustodianProfileDownloader) {