| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <memory> | 5 #include <memory> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/json/json_string_value_serializer.h" | 8 #include "base/json/json_string_value_serializer.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 | 175 |
| 176 IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, | 176 IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, |
| 177 IgnoreLocalChangesToManagedPrefs) { | 177 IgnoreLocalChangesToManagedPrefs) { |
| 178 TestSyncedPrefObserver observer = {}; | 178 TestSyncedPrefObserver observer = {}; |
| 179 registrar()->Add(prefs::kShowHomeButton, | 179 registrar()->Add(prefs::kShowHomeButton, |
| 180 base::Bind(&TestPrefChangeCallback, prefs(), &observer)); | 180 base::Bind(&TestPrefChangeCallback, prefs(), &observer)); |
| 181 | 181 |
| 182 policy::PolicyMap policies; | 182 policy::PolicyMap policies; |
| 183 policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, | 183 policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, |
| 184 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, | 184 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, |
| 185 base::WrapUnique(new base::FundamentalValue(true)), nullptr); | 185 base::MakeUnique<base::FundamentalValue>(true), nullptr); |
| 186 UpdateChromePolicy(policies); | 186 UpdateChromePolicy(policies); |
| 187 | 187 |
| 188 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton)); | 188 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton)); |
| 189 | 189 |
| 190 SetBooleanPrefValueFromLocal(prefs::kShowHomeButton, false); | 190 SetBooleanPrefValueFromLocal(prefs::kShowHomeButton, false); |
| 191 EXPECT_FALSE(observer.has_been_notified); | 191 EXPECT_FALSE(observer.has_been_notified); |
| 192 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton)); | 192 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton)); |
| 193 } | 193 } |
| 194 | 194 |
| 195 IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, | 195 IN_PROC_BROWSER_TEST_F(SyncedPrefChangeRegistrarTest, |
| 196 IgnoreSyncChangesToManagedPrefs) { | 196 IgnoreSyncChangesToManagedPrefs) { |
| 197 TestSyncedPrefObserver observer = {}; | 197 TestSyncedPrefObserver observer = {}; |
| 198 registrar()->Add(prefs::kShowHomeButton, | 198 registrar()->Add(prefs::kShowHomeButton, |
| 199 base::Bind(&TestPrefChangeCallback, prefs(), &observer)); | 199 base::Bind(&TestPrefChangeCallback, prefs(), &observer)); |
| 200 | 200 |
| 201 policy::PolicyMap policies; | 201 policy::PolicyMap policies; |
| 202 policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, | 202 policies.Set(policy::key::kShowHomeButton, policy::POLICY_LEVEL_MANDATORY, |
| 203 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, | 203 policy::POLICY_SCOPE_USER, policy::POLICY_SOURCE_CLOUD, |
| 204 base::WrapUnique(new base::FundamentalValue(true)), nullptr); | 204 base::MakeUnique<base::FundamentalValue>(true), nullptr); |
| 205 UpdateChromePolicy(policies); | 205 UpdateChromePolicy(policies); |
| 206 | 206 |
| 207 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton)); | 207 EXPECT_TRUE(prefs()->IsManagedPreference(prefs::kShowHomeButton)); |
| 208 SetBooleanPrefValueFromSync(prefs::kShowHomeButton, false); | 208 SetBooleanPrefValueFromSync(prefs::kShowHomeButton, false); |
| 209 EXPECT_FALSE(observer.has_been_notified); | 209 EXPECT_FALSE(observer.has_been_notified); |
| 210 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton)); | 210 EXPECT_TRUE(GetBooleanPrefValue(prefs::kShowHomeButton)); |
| 211 } | 211 } |
| OLD | NEW |