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

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

Issue 1304843004: Add source column to chrome://policy showing the origins of policies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed browsertest and removed unnecessary string for default values. Created 5 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
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 "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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
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->Set(key::kChromeOsMultiProfileUserBehavior,
148 POLICY_LEVEL_MANDATORY, 148 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
Thiemo Nagel 2015/09/01 17:40:36 Don't reformat!
fhorschig 2015/09/04 06:53:53 Done.
149 POLICY_SCOPE_USER, 149 new base::StringValue("primary-only"), NULL,
150 new base::StringValue("primary-only"), 150 POLICY_SOURCE_ENTERPRISE_DEFAULT);
151 NULL); 151 policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
152 policy_map->Set(key::kEasyUnlockAllowed, 152 POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL,
153 POLICY_LEVEL_MANDATORY, 153 POLICY_SOURCE_ENTERPRISE_DEFAULT);
154 POLICY_SCOPE_USER,
155 new base::FundamentalValue(false),
156 NULL);
157 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 154 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
158 POLICY_LEVEL_MANDATORY, 155 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
159 POLICY_SCOPE_USER, 156 new base::FundamentalValue(false), NULL,
160 new base::FundamentalValue(false), 157 POLICY_SOURCE_ENTERPRISE_DEFAULT);
161 NULL);
162 #endif 158 #endif
163 } 159 }
164 160
165 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { 161 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
166 expected->Set(key::kShowHomeButton, 162 expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
167 POLICY_LEVEL_MANDATORY, 163 new base::FundamentalValue(true), NULL, POLICY_SOURCE_CLOUD);
168 POLICY_SCOPE_USER, 164 expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
169 new base::FundamentalValue(true), 165 POLICY_SCOPE_USER, new base::FundamentalValue(4), NULL,
170 NULL); 166 POLICY_SOURCE_CLOUD);
171 expected->Set(key::kRestoreOnStartup,
172 POLICY_LEVEL_MANDATORY,
173 POLICY_SCOPE_USER,
174 new base::FundamentalValue(4),
175 NULL);
176 base::ListValue list; 167 base::ListValue list;
177 list.AppendString("dev.chromium.org"); 168 list.AppendString("dev.chromium.org");
178 list.AppendString("youtube.com"); 169 list.AppendString("youtube.com");
179 expected->Set( 170 expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
180 key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 171 list.DeepCopy(), NULL, POLICY_SOURCE_CLOUD);
181 list.DeepCopy(), NULL); 172 expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
182 expected->Set(key::kMaxInvalidationFetchDelay, 173 POLICY_SCOPE_USER, new base::FundamentalValue(1000), NULL,
183 POLICY_LEVEL_MANDATORY, 174 POLICY_SOURCE_CLOUD);
184 POLICY_SCOPE_USER, 175 expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
185 new base::FundamentalValue(1000), 176 POLICY_SCOPE_USER, new base::StringValue(homepage), NULL,
186 NULL); 177 POLICY_SOURCE_CLOUD);
187 expected->Set(key::kHomepageLocation,
188 POLICY_LEVEL_RECOMMENDED,
189 POLICY_SCOPE_USER,
190 new base::StringValue(homepage),
191 NULL);
192 #if defined(OS_CHROMEOS) 178 #if defined(OS_CHROMEOS)
193 expected->Set(key::kChromeOsMultiProfileUserBehavior, 179 expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
194 POLICY_LEVEL_MANDATORY, 180 POLICY_SCOPE_USER, new base::StringValue("primary-only"), NULL,
195 POLICY_SCOPE_USER, 181 POLICY_SOURCE_ENTERPRISE_DEFAULT);
196 new base::StringValue("primary-only"), 182 expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
197 NULL); 183 POLICY_SCOPE_USER, new base::FundamentalValue(false), NULL,
198 expected->Set(key::kEasyUnlockAllowed, 184 POLICY_SOURCE_ENTERPRISE_DEFAULT);
199 POLICY_LEVEL_MANDATORY,
200 POLICY_SCOPE_USER,
201 new base::FundamentalValue(false),
202 NULL);
203 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 185 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
204 POLICY_LEVEL_MANDATORY, 186 POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
205 POLICY_SCOPE_USER, 187 new base::FundamentalValue(false), NULL,
206 new base::FundamentalValue(false), 188 POLICY_SOURCE_ENTERPRISE_DEFAULT);
207 NULL);
208 #endif 189 #endif
209 } 190 }
210 191
211 } // namespace 192 } // namespace
212 193
213 // Tests the cloud policy stack(s). 194 // Tests the cloud policy stack(s).
214 class CloudPolicyTest : public InProcessBrowserTest, 195 class CloudPolicyTest : public InProcessBrowserTest,
215 public PolicyService::Observer { 196 public PolicyService::Observer {
216 protected: 197 protected:
217 CloudPolicyTest() {} 198 CloudPolicyTest() {}
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 481
501 // They should now serialize to the same bytes. 482 // They should now serialize to the same bytes.
502 std::string chrome_settings_serialized; 483 std::string chrome_settings_serialized;
503 std::string cloud_policy_serialized; 484 std::string cloud_policy_serialized;
504 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); 485 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
505 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); 486 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
506 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); 487 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
507 } 488 }
508 489
509 } // namespace policy 490 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698