| 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 10335de4f96dfebf11632e4776195629d7f10cfa..9e9224e50b441e04202c839960d6ee75db7ccdae 100644
|
| --- a/components/policy/core/browser/proxy_policy_handler_unittest.cc
|
| +++ b/components/policy/core/browser/proxy_policy_handler_unittest.cc
|
| @@ -86,7 +86,7 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptions) {
|
| policy.Set(
|
| key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| @@ -102,7 +102,7 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsReversedApplyOrder) {
|
| policy.Set(
|
| key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
|
| nullptr);
|
| policy.Set(key::kProxyBypassList, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| @@ -125,7 +125,7 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsInvalid) {
|
| policy.Set(
|
| key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| @@ -137,7 +137,7 @@ TEST_F(ProxyPolicyHandlerTest, ManualOptionsInvalid) {
|
| TEST_F(ProxyPolicyHandlerTest, NoProxyServerMode) {
|
| PolicyMap policy;
|
| policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| - POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(
|
| + POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_SERVER_MODE),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| @@ -160,7 +160,7 @@ TEST_F(ProxyPolicyHandlerTest, AutoDetectProxyServerMode) {
|
| PolicyMap policy;
|
| policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| @@ -238,7 +238,7 @@ TEST_F(ProxyPolicyHandlerTest, UseSystemProxyServerMode) {
|
| PolicyMap policy;
|
| policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(
|
| + base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| @@ -261,7 +261,7 @@ TEST_F(ProxyPolicyHandlerTest,
|
| ProxyModeOverridesProxyServerMode) {
|
| PolicyMap policy;
|
| policy.Set(key::kProxyServerMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| - POLICY_SOURCE_CLOUD, base::MakeUnique<base::FundamentalValue>(
|
| + POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(
|
| ProxyPolicyHandler::PROXY_SERVER_MODE),
|
| nullptr);
|
| policy.Set(key::kProxyMode, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| @@ -291,7 +291,7 @@ TEST_F(ProxyPolicyHandlerTest, ProxyInvalid) {
|
| 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::MakeUnique<base::FundamentalValue>(i),
|
| + POLICY_SOURCE_CLOUD, base::MakeUnique<base::Value>(i),
|
| nullptr);
|
| UpdateProviderPolicy(policy);
|
| const base::Value* value = nullptr;
|
|
|