Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(485)

Side by Side Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 2282743002: Disable NTP Content Suggestions by default for enterprise users (Closed)
Patch Set: GetExpectedTestPolicy calls GetExpectedDefaultPolicy Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | components/policy/core/common/cloud/user_cloud_policy_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <memory> 5 #include <memory>
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 "}"; 142 "}";
143 143
144 return base::StringPrintf(kTestPolicy, 144 return base::StringPrintf(kTestPolicy,
145 dm_protocol::kChromeUserPolicyType, 145 dm_protocol::kChromeUserPolicyType,
146 homepage, 146 homepage,
147 GetTestUser(), 147 GetTestUser(),
148 key_version); 148 key_version);
149 } 149 }
150 150
151 void GetExpectedDefaultPolicy(PolicyMap* policy_map) { 151 void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
152 policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
153 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
154 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
152 #if defined(OS_CHROMEOS) 155 #if defined(OS_CHROMEOS)
153 policy_map->Set( 156 policy_map->Set(
154 key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY, 157 key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
155 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 158 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
156 base::WrapUnique(new base::StringValue("primary-only")), nullptr); 159 base::WrapUnique(new base::StringValue("primary-only")), nullptr);
157 policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY, 160 policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
158 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 161 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
159 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 162 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
160 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 163 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
161 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 164 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
162 POLICY_SOURCE_ENTERPRISE_DEFAULT, 165 POLICY_SOURCE_ENTERPRISE_DEFAULT,
163 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 166 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
164 policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY, 167 policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
165 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 168 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
166 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 169 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
167 policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 170 policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
168 POLICY_SOURCE_ENTERPRISE_DEFAULT, 171 POLICY_SOURCE_ENTERPRISE_DEFAULT,
169 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 172 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
170 policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY, 173 policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
171 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT, 174 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
172 base::WrapUnique(new base::FundamentalValue(false)), nullptr); 175 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
173 #endif 176 #endif
174 } 177 }
175 178
176 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { 179 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
180 GetExpectedDefaultPolicy(expected);
181
177 expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 182 expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
178 POLICY_SOURCE_CLOUD, 183 POLICY_SOURCE_CLOUD,
179 base::WrapUnique(new base::FundamentalValue(true)), nullptr); 184 base::WrapUnique(new base::FundamentalValue(true)), nullptr);
180 expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY, 185 expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
181 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 186 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
182 base::WrapUnique(new base::FundamentalValue(4)), nullptr); 187 base::WrapUnique(new base::FundamentalValue(4)), nullptr);
183 base::ListValue list; 188 base::ListValue list;
184 list.AppendString("dev.chromium.org"); 189 list.AppendString("dev.chromium.org");
185 list.AppendString("youtube.com"); 190 list.AppendString("youtube.com");
186 expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 191 expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
187 POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr); 192 POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
188 expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY, 193 expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
189 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 194 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
190 base::WrapUnique(new base::FundamentalValue(1000)), nullptr); 195 base::WrapUnique(new base::FundamentalValue(1000)), nullptr);
191 expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED, 196 expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
192 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, 197 POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
193 base::WrapUnique(new base::StringValue(homepage)), nullptr); 198 base::WrapUnique(new base::StringValue(homepage)), nullptr);
194 #if defined(OS_CHROMEOS)
195 expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
196 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
197 base::WrapUnique(new base::StringValue("primary-only")),
198 nullptr);
199 expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
200 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
201 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
202 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
203 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
204 POLICY_SOURCE_ENTERPRISE_DEFAULT,
205 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
206 expected->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
207 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
208 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
209 expected->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
210 POLICY_SOURCE_ENTERPRISE_DEFAULT,
211 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
212 expected->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
213 POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
214 base::WrapUnique(new base::FundamentalValue(false)), nullptr);
215 #endif
216 } 199 }
217 200
218 } // namespace 201 } // namespace
219 202
220 // Tests the cloud policy stack(s). 203 // Tests the cloud policy stack(s).
221 class CloudPolicyTest : public InProcessBrowserTest, 204 class CloudPolicyTest : public InProcessBrowserTest,
222 public PolicyService::Observer { 205 public PolicyService::Observer {
223 protected: 206 protected:
224 CloudPolicyTest() {} 207 CloudPolicyTest() {}
225 ~CloudPolicyTest() override {} 208 ~CloudPolicyTest() override {}
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
511 494
512 // They should now serialize to the same bytes. 495 // They should now serialize to the same bytes.
513 std::string chrome_settings_serialized; 496 std::string chrome_settings_serialized;
514 std::string cloud_policy_serialized; 497 std::string cloud_policy_serialized;
515 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); 498 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
516 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); 499 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
517 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); 500 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
518 } 501 }
519 502
520 } // namespace policy 503 } // namespace policy
OLDNEW
« no previous file with comments | « no previous file | components/policy/core/common/cloud/user_cloud_policy_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698