| 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 2c0092a19bd37f10744db239ee2484b30f7c17c6..c71c27ecd0c0a7c9fb93db8de63e002c54411c62 100644
|
| --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| @@ -151,7 +151,7 @@ std::string GetTestPolicy(const char* homepage, int key_version) {
|
| void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
|
| policy_map->Set(key::kNTPContentSuggestionsEnabled, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::WrapUnique(new base::FundamentalValue(false)), nullptr);
|
| + base::WrapUnique(new base::Value(false)), nullptr);
|
| #if defined(OS_CHROMEOS)
|
| policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
|
| POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| @@ -159,20 +159,20 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
|
| base::MakeUnique<base::StringValue>("primary-only"), nullptr);
|
| policy_map->Set(key::kEasyUnlockAllowed, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
|
| POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| policy_map->Set(key::kAllowDinosaurEasterEgg, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| policy_map->Set(key::kArcEnabled, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| policy_map->Set(key::kPacHttpsUrlStrippingEnabled, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| - base::MakeUnique<base::FundamentalValue>(false), nullptr);
|
| + base::MakeUnique<base::Value>(false), nullptr);
|
| #endif
|
| }
|
|
|
| @@ -181,10 +181,10 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
|
|
|
| expected->Set(key::kShowHomeButton, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(true), nullptr);
|
| + base::MakeUnique<base::Value>(true), nullptr);
|
| expected->Set(key::kRestoreOnStartup, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(4), nullptr);
|
| + base::MakeUnique<base::Value>(4), nullptr);
|
| base::ListValue list;
|
| list.AppendString("dev.chromium.org");
|
| list.AppendString("youtube.com");
|
| @@ -192,7 +192,7 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
|
| POLICY_SOURCE_CLOUD, list.CreateDeepCopy(), nullptr);
|
| expected->Set(key::kMaxInvalidationFetchDelay, POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| - base::MakeUnique<base::FundamentalValue>(1000), nullptr);
|
| + base::MakeUnique<base::Value>(1000), nullptr);
|
| expected->Set(key::kHomepageLocation, POLICY_LEVEL_RECOMMENDED,
|
| POLICY_SCOPE_USER, POLICY_SOURCE_CLOUD,
|
| base::MakeUnique<base::StringValue>(homepage), nullptr);
|
|
|