| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/policy/policy_map.h" | 5 #include "chrome/browser/policy/policy_map.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 a.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_RECOMMENDED, | 96 a.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_RECOMMENDED, |
| 97 POLICY_SCOPE_MACHINE, Value::CreateStringValue("google.com/q={x}")); | 97 POLICY_SCOPE_MACHINE, Value::CreateStringValue("google.com/q={x}")); |
| 98 | 98 |
| 99 PolicyMap b; | 99 PolicyMap b; |
| 100 b.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, | 100 b.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 101 Value::CreateStringValue("chromium.org")); | 101 Value::CreateStringValue("chromium.org")); |
| 102 b.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, | 102 b.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 103 Value::CreateBooleanValue(false)); | 103 Value::CreateBooleanValue(false)); |
| 104 b.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED, | 104 b.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED, |
| 105 POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true)); | 105 POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true)); |
| 106 b.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, | 106 b.Set(key::kDefaultSearchProviderSearchURL, |
| 107 POLICY_SCOPE_MACHINE, Value::CreateStringValue("")); | 107 POLICY_LEVEL_MANDATORY, |
| 108 b.Set(key::kDisableSpdy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, | 108 POLICY_SCOPE_MACHINE, |
| 109 Value::CreateStringValue(std::string())); |
| 110 b.Set(key::kDisableSpdy, |
| 111 POLICY_LEVEL_RECOMMENDED, |
| 112 POLICY_SCOPE_USER, |
| 109 Value::CreateBooleanValue(true)); | 113 Value::CreateBooleanValue(true)); |
| 110 | 114 |
| 111 a.MergeFrom(b); | 115 a.MergeFrom(b); |
| 112 | 116 |
| 113 PolicyMap c; | 117 PolicyMap c; |
| 114 // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER. | 118 // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER. |
| 115 c.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, | 119 c.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 116 Value::CreateStringValue("chromium.org")); | 120 Value::CreateStringValue("chromium.org")); |
| 117 // |a| has precedence over |b|. | 121 // |a| has precedence over |b|. |
| 118 c.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, | 122 c.Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_MACHINE, |
| 119 Value::CreateBooleanValue(true)); | 123 Value::CreateBooleanValue(true)); |
| 120 // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER for POLICY_LEVEL_RECOMMENDED. | 124 // POLICY_SCOPE_MACHINE over POLICY_SCOPE_USER for POLICY_LEVEL_RECOMMENDED. |
| 121 c.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED, | 125 c.Set(key::kBookmarkBarEnabled, POLICY_LEVEL_RECOMMENDED, |
| 122 POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true)); | 126 POLICY_SCOPE_MACHINE, Value::CreateBooleanValue(true)); |
| 123 // POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED. | 127 // POLICY_LEVEL_MANDATORY over POLICY_LEVEL_RECOMMENDED. |
| 124 c.Set(key::kDefaultSearchProviderSearchURL, POLICY_LEVEL_MANDATORY, | 128 c.Set(key::kDefaultSearchProviderSearchURL, |
| 125 POLICY_SCOPE_MACHINE, Value::CreateStringValue("")); | 129 POLICY_LEVEL_MANDATORY, |
| 130 POLICY_SCOPE_MACHINE, |
| 131 Value::CreateStringValue(std::string())); |
| 126 // Merge new ones. | 132 // Merge new ones. |
| 127 c.Set(key::kDisableSpdy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, | 133 c.Set(key::kDisableSpdy, POLICY_LEVEL_RECOMMENDED, POLICY_SCOPE_USER, |
| 128 Value::CreateBooleanValue(true)); | 134 Value::CreateBooleanValue(true)); |
| 129 | 135 |
| 130 EXPECT_TRUE(a.Equals(c)); | 136 EXPECT_TRUE(a.Equals(c)); |
| 131 } | 137 } |
| 132 | 138 |
| 133 TEST(PolicyMapTest, GetDifferingKeys) { | 139 TEST(PolicyMapTest, GetDifferingKeys) { |
| 134 PolicyMap a; | 140 PolicyMap a; |
| 135 a.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, | 141 a.Set(key::kHomepageLocation, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 173 EXPECT_TRUE(diff.find(key::kDisableSpdy) != diff.end()); | 179 EXPECT_TRUE(diff.find(key::kDisableSpdy) != diff.end()); |
| 174 // Not in |b|. | 180 // Not in |b|. |
| 175 EXPECT_TRUE(diff.find(key::kDisable3DAPIs) != diff.end()); | 181 EXPECT_TRUE(diff.find(key::kDisable3DAPIs) != diff.end()); |
| 176 // No surprises. | 182 // No surprises. |
| 177 EXPECT_EQ(5u, diff.size()); | 183 EXPECT_EQ(5u, diff.size()); |
| 178 } | 184 } |
| 179 | 185 |
| 180 } // namespace | 186 } // namespace |
| 181 | 187 |
| 182 } // namespace policy | 188 } // namespace policy |
| OLD | NEW |