| Index: chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
|
| diff --git a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc b/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
|
| index ae268dc819e6f5b538e6012db2465b1c851c05cc..74ba384c58a5a66e9e69dec33400801f5acf5f27 100644
|
| --- a/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
|
| +++ b/chrome/browser/managed_mode/supervised_user_pref_store_unittest.cc
|
| @@ -99,7 +99,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
|
| EXPECT_TRUE(fixture.initialization_completed());
|
| EXPECT_EQ(0u, fixture.changed_prefs()->size());
|
|
|
| - service_.Activate();
|
| + service_.SetActive(true);
|
|
|
| // kAllowDeletingBrowserHistory is hardcoded to false for managed users.
|
| bool allow_deleting_browser_history = true;
|
| @@ -120,7 +120,7 @@ TEST_F(SupervisedUserPrefStoreTest, ConfigureSettings) {
|
|
|
| // Activating the service again should not change anything.
|
| fixture.changed_prefs()->Clear();
|
| - service_.Activate();
|
| + service_.SetActive(true);
|
| EXPECT_EQ(0u, fixture.changed_prefs()->size());
|
|
|
| // kManagedModeManualHosts can be configured by the custodian.
|
| @@ -151,7 +151,7 @@ TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {
|
| SupervisedUserPrefStoreFixture fixture(&service_);
|
| EXPECT_FALSE(fixture.initialization_completed());
|
|
|
| - service_.Activate();
|
| + service_.SetActive(true);
|
| EXPECT_FALSE(fixture.initialization_completed());
|
| EXPECT_EQ(0u, fixture.changed_prefs()->size());
|
|
|
| @@ -162,7 +162,7 @@ TEST_F(SupervisedUserPrefStoreTest, ActivateSettingsBeforeInitialization) {
|
|
|
| TEST_F(SupervisedUserPrefStoreTest, CreatePrefStoreAfterInitialization) {
|
| pref_store_->SetInitializationCompleted();
|
| - service_.Activate();
|
| + service_.SetActive(true);
|
|
|
| SupervisedUserPrefStoreFixture fixture(&service_);
|
| EXPECT_TRUE(fixture.initialization_completed());
|
|
|