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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/cloud/cloud_policy_browsertest.cc

Issue 1940153002: Use std::unique_ptr to express ownership of base::Value in PolicyMap::Entry (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More fixes (partial Windows fix) Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc ('k') | chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc » ('j') | components/policy/core/browser/proxy_policy_handler_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/cloud/cloud_policy_browsertest.cc
diff --git a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
index d307475694d51d68bccaeb804f3cc09db740dd32..0566081e99b790b596f84a4cbea88c5dc05ccd97 100644
--- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
+++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
@@ -150,104 +150,62 @@ std::string GetTestPolicy(const char* homepage, int key_version) {
void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
#if defined(OS_CHROMEOS)
- policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::StringValue("primary-only"),
- nullptr);
- policy_map->Set(key::kEasyUnlockAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
+ policy_map->Set(
+ key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::StringValue("primary-only")), nullptr);
+ policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
- policy_map->Set(key::kAllowDinosaurEasterEgg,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
- policy_map->Set(key::kArcEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
#endif
}
void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
- expected->Set(key::kShowHomeButton,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(true),
- nullptr);
- expected->Set(key::kRestoreOnStartup,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(4),
- nullptr);
+ base::WrapUnique(new base::FundamentalValue(true)), nullptr);
+ expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(4)), nullptr);
base::ListValue list;
list.AppendString("dev.chromium.org");
list.AppendString("youtube.com");
- expected->Set(key::kURLBlacklist,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- list.DeepCopy(),
- nullptr);
- expected->Set(key::kMaxInvalidationFetchDelay,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::FundamentalValue(1000),
- nullptr);
- expected->Set(key::kHomepageLocation,
- POLICY_LEVEL_RECOMMENDED,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- new base::StringValue(homepage),
- nullptr);
+ expected->Set(key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
+ expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::FundamentalValue(1000)), nullptr);
+ expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
+ base::WrapUnique(new base::StringValue(homepage)), nullptr);
#if defined(OS_CHROMEOS)
- expected->Set(key::kChromeOsMultiProfileUserBehavior,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::StringValue("primary-only"),
- nullptr);
- expected->Set(key::kEasyUnlockAllowed,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
+ expected->Set(key::kChromeOsMultiProfileUserBehavior, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::StringValue("primary-only")),
nullptr);
+ expected->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
- expected->Set(key::kAllowDinosaurEasterEgg,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
- POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
- expected->Set(key::kArcEnabled,
- POLICY_LEVEL_MANDATORY,
- POLICY_SCOPE_USER,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ expected->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
+ POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
+ expected->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_ENTERPRISE_DEFAULT,
- new base::FundamentalValue(false),
- nullptr);
+ base::WrapUnique(new base::FundamentalValue(false)), nullptr);
#endif
}
« no previous file with comments | « chrome/browser/net/disk_cache_dir_policy_handler_unittest.cc ('k') | chrome/browser/policy/file_selection_dialogs_policy_handler_unittest.cc » ('j') | components/policy/core/browser/proxy_policy_handler_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698