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 "base/callback.h" | 5 #include "base/callback.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "base/files/file_util.h" | 8 #include "base/files/file_util.h" |
9 #include "base/files/scoped_temp_dir.h" | 9 #include "base/files/scoped_temp_dir.h" |
10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
137 | 137 |
138 return base::StringPrintf(kTestPolicy, | 138 return base::StringPrintf(kTestPolicy, |
139 dm_protocol::kChromeUserPolicyType, | 139 dm_protocol::kChromeUserPolicyType, |
140 homepage, | 140 homepage, |
141 GetTestUser(), | 141 GetTestUser(), |
142 key_version); | 142 key_version); |
143 } | 143 } |
144 | 144 |
145 void GetExpectedDefaultPolicy(PolicyMap* policy_map) { | 145 void GetExpectedDefaultPolicy(PolicyMap* policy_map) { |
146 #if defined(OS_CHROMEOS) | 146 #if defined(OS_CHROMEOS) |
147 policy_map->Set(key::kChromeOsMultiProfileUserBehavior, | 147 policy_map->SetWithSource(key::kChromeOsMultiProfileUserBehavior, |
148 POLICY_LEVEL_MANDATORY, | 148 POLICY_LEVEL_MANDATORY, |
149 POLICY_SCOPE_USER, | 149 POLICY_SCOPE_USER, |
150 new base::StringValue("primary-only"), | 150 new base::StringValue("primary-only"), |
151 NULL); | 151 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
152 policy_map->Set(key::kEasyUnlockAllowed, | 152 POLICY_SOURCE_ENTERPRISE_DEFAULT); |
bartfab (slow)
2015/09/14 14:42:26
Nit: #include "components/policy/core/common/polic
fhorschig
2015/09/16 13:52:04
Done.
| |
153 POLICY_LEVEL_MANDATORY, | 153 policy_map->SetWithSource(key::kEasyUnlockAllowed, |
154 POLICY_SCOPE_USER, | 154 POLICY_LEVEL_MANDATORY, |
155 new base::FundamentalValue(false), | 155 POLICY_SCOPE_USER, |
156 NULL); | 156 new base::FundamentalValue(false), |
157 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, | 157 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
158 POLICY_LEVEL_MANDATORY, | 158 POLICY_SOURCE_ENTERPRISE_DEFAULT); |
159 POLICY_SCOPE_USER, | 159 policy_map->SetWithSource(key::kCaptivePortalAuthenticationIgnoresProxy, |
160 new base::FundamentalValue(false), | 160 POLICY_LEVEL_MANDATORY, |
161 NULL); | 161 POLICY_SCOPE_USER, |
162 new base::FundamentalValue(false), | |
163 NULL, | |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
164 POLICY_SOURCE_ENTERPRISE_DEFAULT); | |
162 #endif | 165 #endif |
163 } | 166 } |
164 | 167 |
165 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { | 168 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { |
166 expected->Set(key::kShowHomeButton, | 169 expected->SetWithSource(key::kShowHomeButton, |
167 POLICY_LEVEL_MANDATORY, | 170 POLICY_LEVEL_MANDATORY, |
168 POLICY_SCOPE_USER, | 171 POLICY_SCOPE_USER, |
169 new base::FundamentalValue(true), | 172 new base::FundamentalValue(true), |
170 NULL); | 173 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
171 expected->Set(key::kRestoreOnStartup, | 174 POLICY_SOURCE_CLOUD); |
172 POLICY_LEVEL_MANDATORY, | 175 expected->SetWithSource(key::kRestoreOnStartup, |
173 POLICY_SCOPE_USER, | 176 POLICY_LEVEL_MANDATORY, |
174 new base::FundamentalValue(4), | 177 POLICY_SCOPE_USER, |
175 NULL); | 178 new base::FundamentalValue(4), |
179 NULL, | |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
180 POLICY_SOURCE_CLOUD); | |
176 base::ListValue list; | 181 base::ListValue list; |
177 list.AppendString("dev.chromium.org"); | 182 list.AppendString("dev.chromium.org"); |
178 list.AppendString("youtube.com"); | 183 list.AppendString("youtube.com"); |
179 expected->Set( | 184 expected->SetWithSource(key::kURLBlacklist, |
180 key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, | 185 POLICY_LEVEL_MANDATORY, |
181 list.DeepCopy(), NULL); | 186 POLICY_SCOPE_USER, |
182 expected->Set(key::kMaxInvalidationFetchDelay, | 187 list.DeepCopy(), |
183 POLICY_LEVEL_MANDATORY, | 188 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
184 POLICY_SCOPE_USER, | 189 POLICY_SOURCE_CLOUD); |
185 new base::FundamentalValue(1000), | 190 expected->SetWithSource(key::kMaxInvalidationFetchDelay, |
186 NULL); | 191 POLICY_LEVEL_MANDATORY, |
187 expected->Set(key::kHomepageLocation, | 192 POLICY_SCOPE_USER, |
188 POLICY_LEVEL_RECOMMENDED, | 193 new base::FundamentalValue(1000), |
189 POLICY_SCOPE_USER, | 194 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
190 new base::StringValue(homepage), | 195 POLICY_SOURCE_CLOUD); |
191 NULL); | 196 expected->SetWithSource(key::kHomepageLocation, |
197 POLICY_LEVEL_RECOMMENDED, | |
198 POLICY_SCOPE_USER, | |
199 new base::StringValue(homepage), | |
200 NULL, | |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
201 POLICY_SOURCE_CLOUD); | |
192 #if defined(OS_CHROMEOS) | 202 #if defined(OS_CHROMEOS) |
193 expected->Set(key::kChromeOsMultiProfileUserBehavior, | 203 expected->SetWithSource(key::kChromeOsMultiProfileUserBehavior, |
194 POLICY_LEVEL_MANDATORY, | 204 POLICY_LEVEL_MANDATORY, |
195 POLICY_SCOPE_USER, | 205 POLICY_SCOPE_USER, |
196 new base::StringValue("primary-only"), | 206 new base::StringValue("primary-only"), |
197 NULL); | 207 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
198 expected->Set(key::kEasyUnlockAllowed, | 208 POLICY_SOURCE_ENTERPRISE_DEFAULT); |
199 POLICY_LEVEL_MANDATORY, | 209 expected->SetWithSource(key::kEasyUnlockAllowed, |
200 POLICY_SCOPE_USER, | 210 POLICY_LEVEL_MANDATORY, |
201 new base::FundamentalValue(false), | 211 POLICY_SCOPE_USER, |
202 NULL); | 212 new base::FundamentalValue(false), |
203 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy, | 213 NULL, |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
204 POLICY_LEVEL_MANDATORY, | 214 POLICY_SOURCE_ENTERPRISE_DEFAULT); |
205 POLICY_SCOPE_USER, | 215 expected->SetWithSource(key::kCaptivePortalAuthenticationIgnoresProxy, |
206 new base::FundamentalValue(false), | 216 POLICY_LEVEL_MANDATORY, |
207 NULL); | 217 POLICY_SCOPE_USER, |
218 new base::FundamentalValue(false), | |
219 NULL, | |
bartfab (slow)
2015/09/14 14:42:26
Nit: s/NULL/nullptr/
fhorschig
2015/09/16 13:52:04
Done.
| |
220 POLICY_SOURCE_ENTERPRISE_DEFAULT); | |
208 #endif | 221 #endif |
209 } | 222 } |
210 | 223 |
211 } // namespace | 224 } // namespace |
212 | 225 |
213 // Tests the cloud policy stack(s). | 226 // Tests the cloud policy stack(s). |
214 class CloudPolicyTest : public InProcessBrowserTest, | 227 class CloudPolicyTest : public InProcessBrowserTest, |
215 public PolicyService::Observer { | 228 public PolicyService::Observer { |
216 protected: | 229 protected: |
217 CloudPolicyTest() {} | 230 CloudPolicyTest() {} |
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
500 | 513 |
501 // They should now serialize to the same bytes. | 514 // They should now serialize to the same bytes. |
502 std::string chrome_settings_serialized; | 515 std::string chrome_settings_serialized; |
503 std::string cloud_policy_serialized; | 516 std::string cloud_policy_serialized; |
504 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); | 517 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); |
505 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); | 518 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); |
506 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); | 519 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); |
507 } | 520 } |
508 | 521 |
509 } // namespace policy | 522 } // namespace policy |
OLD | NEW |