Index: chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
diff --git a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
index b0da54c924bb3666aa98ea036686dd20f77eae5c..d06afea988799739501f4b96bc75ac5ec4778343 100644 |
--- a/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
+++ b/chrome/browser/chromeos/policy/network_configuration_updater_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "base/callback.h" |
#include "base/files/file_path.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/run_loop.h" |
#include "base/values.h" |
#include "chrome/browser/chromeos/policy/device_network_configuration_updater.h" |
@@ -349,12 +350,9 @@ TEST_F(NetworkConfigurationUpdaterTest, PolicyIsValidatedAndRepaired) { |
std::string onc_policy = |
chromeos::onc::test_utils::ReadTestData("toplevel_partially_invalid.onc"); |
PolicyMap policy; |
- policy.Set(key::kOpenNetworkConfiguration, |
- POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, |
- new base::StringValue(onc_policy), |
- NULL); |
+ policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(onc_policy)), nullptr); |
UpdateProviderPolicy(policy); |
EXPECT_CALL(network_config_handler_, |
@@ -473,12 +471,9 @@ TEST_F(NetworkConfigurationUpdaterTest, |
// Change to any non-empty policy, so that updates are triggered. The actual |
// content of the policy is irrelevant. |
PolicyMap policy; |
- policy.Set(key::kOpenNetworkConfiguration, |
- POLICY_LEVEL_MANDATORY, |
- POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, |
- new base::StringValue(kFakeONC), |
- NULL); |
+ policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, |
+ POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
base::RunLoop().RunUntilIdle(); |
@@ -499,7 +494,7 @@ TEST_F(NetworkConfigurationUpdaterTest, |
PolicyMap policy; |
policy.Set(key::kOpenNetworkConfiguration, POLICY_LEVEL_MANDATORY, |
POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD, |
- new base::StringValue(kFakeONC), nullptr); |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
EXPECT_CALL(network_config_handler_, |
@@ -566,7 +561,8 @@ class NetworkConfigurationUpdaterTestWithParam |
TEST_P(NetworkConfigurationUpdaterTestWithParam, InitialUpdates) { |
PolicyMap policy; |
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); |
+ POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
EXPECT_CALL(network_config_handler_, |
@@ -587,7 +583,8 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, |
PolicyNotSetBeforePolicyProviderInitialized) { |
PolicyMap policy; |
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); |
+ POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
CreateNetworkConfigurationUpdater(); |
@@ -614,7 +611,8 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, |
PolicyMap policy; |
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); |
+ POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
EXPECT_CALL(network_config_handler_, |
@@ -653,7 +651,8 @@ TEST_P(NetworkConfigurationUpdaterTestWithParam, PolicyChange) { |
PolicyMap policy; |
policy.Set(GetParam(), POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER, |
- POLICY_SOURCE_CLOUD, new base::StringValue(kFakeONC), nullptr); |
+ POLICY_SOURCE_CLOUD, |
+ base::WrapUnique(new base::StringValue(kFakeONC)), nullptr); |
UpdateProviderPolicy(policy); |
Mock::VerifyAndClearExpectations(&network_config_handler_); |
EXPECT_EQ(ExpectedImportCertificatesCallCount(), |