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

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 another test. 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 18 matching lines...) Expand all
29 #include "components/keyed_service/core/keyed_service.h" 29 #include "components/keyed_service/core/keyed_service.h"
30 #include "components/policy/core/browser/browser_policy_connector.h" 30 #include "components/policy/core/browser/browser_policy_connector.h"
31 #include "components/policy/core/common/cloud/cloud_policy_client.h" 31 #include "components/policy/core/common/cloud/cloud_policy_client.h"
32 #include "components/policy/core/common/cloud/cloud_policy_constants.h" 32 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
33 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h" 33 #include "components/policy/core/common/cloud/mock_cloud_policy_client.h"
34 #include "components/policy/core/common/external_data_fetcher.h" 34 #include "components/policy/core/common/external_data_fetcher.h"
35 #include "components/policy/core/common/policy_map.h" 35 #include "components/policy/core/common/policy_map.h"
36 #include "components/policy/core/common/policy_service.h" 36 #include "components/policy/core/common/policy_service.h"
37 #include "components/policy/core/common/policy_switches.h" 37 #include "components/policy/core/common/policy_switches.h"
38 #include "components/policy/core/common/policy_test_utils.h" 38 #include "components/policy/core/common/policy_test_utils.h"
39 #include "components/policy/core/common/policy_types.h"
39 #include "content/public/browser/notification_service.h" 40 #include "content/public/browser/notification_service.h"
40 #include "content/public/browser/notification_source.h" 41 #include "content/public/browser/notification_source.h"
41 #include "content/public/test/test_utils.h" 42 #include "content/public/test/test_utils.h"
42 #include "net/url_request/url_request_context_getter.h" 43 #include "net/url_request/url_request_context_getter.h"
43 #include "policy/policy_constants.h" 44 #include "policy/policy_constants.h"
44 #include "policy/proto/chrome_settings.pb.h" 45 #include "policy/proto/chrome_settings.pb.h"
45 #include "policy/proto/cloud_policy.pb.h" 46 #include "policy/proto/cloud_policy.pb.h"
46 #include "policy/proto/device_management_backend.pb.h" 47 #include "policy/proto/device_management_backend.pb.h"
47 #include "testing/gmock/include/gmock/gmock.h" 48 #include "testing/gmock/include/gmock/gmock.h"
48 #include "testing/gtest/include/gtest/gtest.h" 49 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 homepage, 141 homepage,
141 GetTestUser(), 142 GetTestUser(),
142 key_version); 143 key_version);
143 } 144 }
144 145
145 void GetExpectedDefaultPolicy(PolicyMap* policy_map) { 146 void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
146 #if defined(OS_CHROMEOS) 147 #if defined(OS_CHROMEOS)
147 policy_map->Set(key::kChromeOsMultiProfileUserBehavior, 148 policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
148 POLICY_LEVEL_MANDATORY, 149 POLICY_LEVEL_MANDATORY,
149 POLICY_SCOPE_USER, 150 POLICY_SCOPE_USER,
151 POLICY_SOURCE_ENTERPRISE_DEFAULT,
150 new base::StringValue("primary-only"), 152 new base::StringValue("primary-only"),
151 NULL); 153 NULL);
152 policy_map->Set(key::kEasyUnlockAllowed, 154 policy_map->Set(key::kEasyUnlockAllowed,
153 POLICY_LEVEL_MANDATORY, 155 POLICY_LEVEL_MANDATORY,
154 POLICY_SCOPE_USER, 156 POLICY_SCOPE_USER,
157 POLICY_SOURCE_ENTERPRISE_DEFAULT,
155 new base::FundamentalValue(false), 158 new base::FundamentalValue(false),
156 NULL); 159 NULL);
157 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 160 policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
158 POLICY_LEVEL_MANDATORY, 161 POLICY_LEVEL_MANDATORY,
159 POLICY_SCOPE_USER, 162 POLICY_SCOPE_USER,
163 POLICY_SOURCE_ENTERPRISE_DEFAULT,
160 new base::FundamentalValue(false), 164 new base::FundamentalValue(false),
161 NULL); 165 NULL);
162 #endif 166 #endif
163 } 167 }
164 168
165 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) { 169 void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
166 expected->Set(key::kShowHomeButton, 170 expected->Set(key::kShowHomeButton,
167 POLICY_LEVEL_MANDATORY, 171 POLICY_LEVEL_MANDATORY,
168 POLICY_SCOPE_USER, 172 POLICY_SCOPE_USER,
173 POLICY_SOURCE_CLOUD,
169 new base::FundamentalValue(true), 174 new base::FundamentalValue(true),
170 NULL); 175 NULL);
171 expected->Set(key::kRestoreOnStartup, 176 expected->Set(key::kRestoreOnStartup,
172 POLICY_LEVEL_MANDATORY, 177 POLICY_LEVEL_MANDATORY,
173 POLICY_SCOPE_USER, 178 POLICY_SCOPE_USER,
179 POLICY_SOURCE_CLOUD,
174 new base::FundamentalValue(4), 180 new base::FundamentalValue(4),
175 NULL); 181 NULL);
176 base::ListValue list; 182 base::ListValue list;
177 list.AppendString("dev.chromium.org"); 183 list.AppendString("dev.chromium.org");
178 list.AppendString("youtube.com"); 184 list.AppendString("youtube.com");
179 expected->Set( 185 expected->Set(key::kURLBlacklist,
180 key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, 186 POLICY_LEVEL_MANDATORY,
181 list.DeepCopy(), NULL); 187 POLICY_SCOPE_USER,
188 POLICY_SOURCE_CLOUD,
189 list.DeepCopy(),
190 nullptr);
182 expected->Set(key::kMaxInvalidationFetchDelay, 191 expected->Set(key::kMaxInvalidationFetchDelay,
183 POLICY_LEVEL_MANDATORY, 192 POLICY_LEVEL_MANDATORY,
184 POLICY_SCOPE_USER, 193 POLICY_SCOPE_USER,
194 POLICY_SOURCE_CLOUD,
185 new base::FundamentalValue(1000), 195 new base::FundamentalValue(1000),
186 NULL); 196 NULL);
187 expected->Set(key::kHomepageLocation, 197 expected->Set(key::kHomepageLocation,
188 POLICY_LEVEL_RECOMMENDED, 198 POLICY_LEVEL_RECOMMENDED,
189 POLICY_SCOPE_USER, 199 POLICY_SCOPE_USER,
200 POLICY_SOURCE_CLOUD,
190 new base::StringValue(homepage), 201 new base::StringValue(homepage),
191 NULL); 202 NULL);
192 #if defined(OS_CHROMEOS) 203 #if defined(OS_CHROMEOS)
193 expected->Set(key::kChromeOsMultiProfileUserBehavior, 204 expected->Set(key::kChromeOsMultiProfileUserBehavior,
194 POLICY_LEVEL_MANDATORY, 205 POLICY_LEVEL_MANDATORY,
195 POLICY_SCOPE_USER, 206 POLICY_SCOPE_USER,
207 POLICY_SOURCE_ENTERPRISE_DEFAULT,
196 new base::StringValue("primary-only"), 208 new base::StringValue("primary-only"),
197 NULL); 209 NULL);
198 expected->Set(key::kEasyUnlockAllowed, 210 expected->Set(key::kEasyUnlockAllowed,
199 POLICY_LEVEL_MANDATORY, 211 POLICY_LEVEL_MANDATORY,
200 POLICY_SCOPE_USER, 212 POLICY_SCOPE_USER,
213 POLICY_SOURCE_ENTERPRISE_DEFAULT,
201 new base::FundamentalValue(false), 214 new base::FundamentalValue(false),
202 NULL); 215 NULL);
203 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy, 216 expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
204 POLICY_LEVEL_MANDATORY, 217 POLICY_LEVEL_MANDATORY,
205 POLICY_SCOPE_USER, 218 POLICY_SCOPE_USER,
219 POLICY_SOURCE_ENTERPRISE_DEFAULT,
206 new base::FundamentalValue(false), 220 new base::FundamentalValue(false),
207 NULL); 221 NULL);
208 #endif 222 #endif
209 } 223 }
210 224
211 } // namespace 225 } // namespace
212 226
213 // Tests the cloud policy stack(s). 227 // Tests the cloud policy stack(s).
214 class CloudPolicyTest : public InProcessBrowserTest, 228 class CloudPolicyTest : public InProcessBrowserTest,
215 public PolicyService::Observer { 229 public PolicyService::Observer {
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
500 514
501 // They should now serialize to the same bytes. 515 // They should now serialize to the same bytes.
502 std::string chrome_settings_serialized; 516 std::string chrome_settings_serialized;
503 std::string cloud_policy_serialized; 517 std::string cloud_policy_serialized;
504 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized)); 518 ASSERT_TRUE(chrome_settings.SerializeToString(&chrome_settings_serialized));
505 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized)); 519 ASSERT_TRUE(cloud_policy.SerializeToString(&cloud_policy_serialized));
506 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized); 520 EXPECT_EQ(chrome_settings_serialized, cloud_policy_serialized);
507 } 521 }
508 522
509 } // namespace policy 523 } // namespace policy
OLDNEW
« no previous file with comments | « chrome/browser/net/proxy_policy_handler_unittest.cc ('k') | chrome/browser/policy/cloud/cloud_policy_invalidator_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698