OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <cryptohi.h> | 5 #include <cryptohi.h> |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> |
8 | 9 |
9 #include "base/json/json_writer.h" | 10 #include "base/json/json_writer.h" |
10 #include "base/macros.h" | 11 #include "base/macros.h" |
11 #include "base/memory/ptr_util.h" | 12 #include "base/memory/ptr_util.h" |
12 #include "base/strings/stringprintf.h" | 13 #include "base/strings/stringprintf.h" |
13 #include "chrome/browser/chromeos/platform_keys/platform_keys_service.h" | 14 #include "chrome/browser/chromeos/platform_keys/platform_keys_service.h" |
14 #include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h" | 15 #include "chrome/browser/chromeos/platform_keys/platform_keys_service_factory.h" |
15 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" | 16 #include "chrome/browser/chromeos/policy/device_policy_cros_browser_test.h" |
16 #include "chrome/browser/chromeos/policy/user_policy_test_helper.h" | 17 #include "chrome/browser/chromeos/policy/user_policy_test_helper.h" |
17 #include "chrome/browser/extensions/extension_apitest.h" | 18 #include "chrome/browser/extensions/extension_apitest.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 void SetupKeyPermissionPolicy() { | 191 void SetupKeyPermissionPolicy() { |
191 // Set up the test policy that gives |extension_| the permission to access | 192 // Set up the test policy that gives |extension_| the permission to access |
192 // corporate keys. | 193 // corporate keys. |
193 base::DictionaryValue key_permissions_policy; | 194 base::DictionaryValue key_permissions_policy; |
194 { | 195 { |
195 std::unique_ptr<base::DictionaryValue> cert1_key_permission( | 196 std::unique_ptr<base::DictionaryValue> cert1_key_permission( |
196 new base::DictionaryValue); | 197 new base::DictionaryValue); |
197 cert1_key_permission->SetBooleanWithoutPathExpansion( | 198 cert1_key_permission->SetBooleanWithoutPathExpansion( |
198 "allowCorporateKeyUsage", true); | 199 "allowCorporateKeyUsage", true); |
199 key_permissions_policy.SetWithoutPathExpansion( | 200 key_permissions_policy.SetWithoutPathExpansion( |
200 extension_->id(), cert1_key_permission.release()); | 201 extension_->id(), std::move(cert1_key_permission)); |
201 } | 202 } |
202 | 203 |
203 std::string key_permissions_policy_str; | 204 std::string key_permissions_policy_str; |
204 base::JSONWriter::WriteWithOptions(key_permissions_policy, | 205 base::JSONWriter::WriteWithOptions(key_permissions_policy, |
205 base::JSONWriter::OPTIONS_PRETTY_PRINT, | 206 base::JSONWriter::OPTIONS_PRETTY_PRINT, |
206 &key_permissions_policy_str); | 207 &key_permissions_policy_str); |
207 | 208 |
208 base::DictionaryValue user_policy; | 209 base::DictionaryValue user_policy; |
209 user_policy.SetStringWithoutPathExpansion(policy::key::kKeyPermissions, | 210 user_policy.SetStringWithoutPathExpansion(policy::key::kKeyPermissions, |
210 key_permissions_policy_str); | 211 key_permissions_policy_str); |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
450 << message_; | 451 << message_; |
451 } | 452 } |
452 | 453 |
453 INSTANTIATE_TEST_CASE_P( | 454 INSTANTIATE_TEST_CASE_P( |
454 ManagedWithPermission, | 455 ManagedWithPermission, |
455 ManagedWithPermissionPlatformKeysTest, | 456 ManagedWithPermissionPlatformKeysTest, |
456 ::testing::Values( | 457 ::testing::Values( |
457 Params(DEVICE_STATUS_ENROLLED, USER_STATUS_MANAGED_AFFILIATED_DOMAIN), | 458 Params(DEVICE_STATUS_ENROLLED, USER_STATUS_MANAGED_AFFILIATED_DOMAIN), |
458 Params(DEVICE_STATUS_ENROLLED, USER_STATUS_MANAGED_OTHER_DOMAIN), | 459 Params(DEVICE_STATUS_ENROLLED, USER_STATUS_MANAGED_OTHER_DOMAIN), |
459 Params(DEVICE_STATUS_NOT_ENROLLED, USER_STATUS_MANAGED_OTHER_DOMAIN))); | 460 Params(DEVICE_STATUS_NOT_ENROLLED, USER_STATUS_MANAGED_OTHER_DOMAIN))); |
OLD | NEW |