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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: components/policy/core/browser/proxy_policy_handler_unittest.cc

Issue 2252353002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/policy/core/browser/configuration_policy_pref_store_unittest.cc ('k') | components/policy/core/browser/url_blacklist_policy_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/policy/core/browser/proxy_policy_handler_unittest.cc
diff --git a/components/policy/core/browser/proxy_policy_handler_unittest.cc b/components/policy/core/browser/proxy_policy_handler_unittest.cc
index d08c9e8373c3e5e250c2ba3816f63cf2944a53d2..10335de4f96dfebf11632e4776195629d7f10cfa 100644
--- a/components/policy/core/browser/proxy_policy_handler_unittest.cc
+++ b/components/policy/core/browser/proxy_policy_handler_unittest.cc
@@ -76,19 +76,18 @@ class ProxyPolicyHandlerTest
TEST_F(ProxyPolicyHandlerTest, ManualOptions) {
PolicyMap policy;
- policy.Set(
- key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("http://chromium.org/override")),
- nullptr);
+ policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ "http://chromium.org/override"),
+ nullptr);
policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("chromium.org")), nullptr);
+ base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
policy.Set(
key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)),
+ base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
nullptr);
UpdateProviderPolicy(policy);
@@ -103,17 +102,16 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsReversedApplyOrder) {
policy.Set(
key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)),
- nullptr);
- policy.Set(
- key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("http://chromium.org/override")),
+ base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
nullptr);
+ policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ "http://chromium.org/override"),
+ nullptr);
policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("chromium.org")), nullptr);
+ base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs("chromium.org",
@@ -127,8 +125,8 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsInvalid) {
policy.Set(
key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE)),
+ base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
nullptr);
UpdateProviderPolicy(policy);
@@ -139,8 +137,8 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsInvalid) {
TEST_F(ProxyPolicyHandlerTest, NoProxyServerMode) {
PolicyMap policy;
policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_SERVER_MODE)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_SERVER_MODE),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(
@@ -149,11 +147,10 @@ TEST_F(ProxyPolicyHandlerTest, NoProxyServerMode) {
TEST_F(ProxyPolicyHandlerTest, NoProxyModeName) {
PolicyMap policy;
- policy.Set(
- key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(ProxyPrefs::kDirectProxyModeName)),
- nullptr);
+ policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kDirectProxyModeName),
+ nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(
std::string(), std::string(), std::string(), ProxyPrefs::MODE_DIRECT);
@@ -163,8 +160,8 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyServerMode) {
PolicyMap policy;
policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE)),
+ base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(std::string(),
@@ -176,8 +173,8 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyServerMode) {
TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyModeName) {
PolicyMap policy;
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::StringValue(
- ProxyPrefs::kAutoDetectProxyModeName)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kAutoDetectProxyModeName),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(std::string(),
@@ -188,14 +185,13 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyModeName) {
TEST_F(ProxyPolicyHandlerTest, PacScriptProxyMode) {
PolicyMap policy;
- policy.Set(
- key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("http://short.org/proxy.pac")),
- nullptr);
+ policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>("http://short.org/proxy.pac"),
+ nullptr);
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::StringValue(
- ProxyPrefs::kPacScriptProxyModeName)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kPacScriptProxyModeName),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(std::string(),
@@ -207,8 +203,8 @@ TEST_F(ProxyPolicyHandlerTest, PacScriptProxyMode) {
TEST_F(ProxyPolicyHandlerTest, PacScriptProxyModeInvalid) {
PolicyMap policy;
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::StringValue(
- ProxyPrefs::kPacScriptProxyModeName)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kPacScriptProxyModeName),
NULL);
UpdateProviderPolicy(policy);
const base::Value* value = NULL;
@@ -242,8 +238,8 @@ TEST_F(ProxyPolicyHandlerTest, UseSystemProxyServerMode) {
PolicyMap policy;
policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE)),
+ base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(
@@ -252,11 +248,10 @@ TEST_F(ProxyPolicyHandlerTest, UseSystemProxyServerMode) {
TEST_F(ProxyPolicyHandlerTest, UseSystemProxyMode) {
PolicyMap policy;
- policy.Set(
- key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue(ProxyPrefs::kSystemProxyModeName)),
- nullptr);
+ policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kSystemProxyModeName),
+ nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(
std::string(), std::string(), std::string(), ProxyPrefs::MODE_SYSTEM);
@@ -266,12 +261,12 @@ TEST_F(ProxyPolicyHandlerTest,
ProxyModeOverridesProxyServerMode) {
PolicyMap policy;
policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::FundamentalValue(
- ProxyPolicyHandler::PROXY_SERVER_MODE)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(
+ ProxyPolicyHandler::PROXY_SERVER_MODE),
nullptr);
policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD, base::WrapUnique(new base::StringValue(
- ProxyPrefs::kAutoDetectProxyModeName)),
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ ProxyPrefs::kAutoDetectProxyModeName),
nullptr);
UpdateProviderPolicy(policy);
VerifyProxyPrefs(std::string(),
@@ -283,23 +278,21 @@ TEST_F(ProxyPolicyHandlerTest,
TEST_F(ProxyPolicyHandlerTest, ProxyInvalid) {
// No mode expects all three parameters being set.
PolicyMap policy;
- policy.Set(
- key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("http://short.org/proxy.pac")),
- nullptr);
- policy.Set(
- key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("http://chromium.org/override")),
- nullptr);
+ policy.Set(key::kProxyPacUrl, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD,
+ base::MakeUnique<base::StringValue>("http://short.org/proxy.pac"),
+ nullptr);
+ policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::StringValue>(
+ "http://chromium.org/override"),
+ nullptr);
policy.Set(key::kProxyServer, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::StringValue("chromium.org")), nullptr);
+ base::MakeUnique<base::StringValue>("chromium.org"), nullptr);
for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) {
policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
- POLICY_SOURCE_CLOUD,
- base::WrapUnique(new base::FundamentalValue(i)), nullptr);
+ POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(i),
+ nullptr);
UpdateProviderPolicy(policy);
const base::Value* value = nullptr;
EXPECT_FALSE(store_->GetValue(proxy_config::prefs::kProxy, &value));
« no previous file with comments | « components/policy/core/browser/configuration_policy_pref_store_unittest.cc ('k') | components/policy/core/browser/url_blacklist_policy_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698