| 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 946f11934e0ecba20ac01f5a41bb0a5897767c34..8ff592f2d54d9a8f436bab35de30819c66a6e26b 100644
|
| --- a/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| +++ b/chrome/browser/policy/cloud/cloud_policy_browsertest.cc
|
| @@ -36,6 +36,7 @@
|
| #include "components/policy/core/common/policy_service.h"
|
| #include "components/policy/core/common/policy_switches.h"
|
| #include "components/policy/core/common/policy_test_utils.h"
|
| +#include "components/policy/core/common/policy_types.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/browser/notification_source.h"
|
| #include "content/public/test/test_utils.h"
|
| @@ -147,16 +148,19 @@ void GetExpectedDefaultPolicy(PolicyMap* policy_map) {
|
| policy_map->Set(key::kChromeOsMultiProfileUserBehavior,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::StringValue("primary-only"),
|
| NULL);
|
| policy_map->Set(key::kEasyUnlockAllowed,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::FundamentalValue(false),
|
| NULL);
|
| policy_map->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::FundamentalValue(false),
|
| NULL);
|
| #endif
|
| @@ -166,43 +170,53 @@ void GetExpectedTestPolicy(PolicyMap* expected, const char* homepage) {
|
| expected->Set(key::kShowHomeButton,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_CLOUD,
|
| new base::FundamentalValue(true),
|
| NULL);
|
| expected->Set(key::kRestoreOnStartup,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_CLOUD,
|
| new base::FundamentalValue(4),
|
| NULL);
|
| base::ListValue list;
|
| list.AppendString("dev.chromium.org");
|
| list.AppendString("youtube.com");
|
| - expected->Set(
|
| - key::kURLBlacklist, POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
|
| - list.DeepCopy(), NULL);
|
| + 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),
|
| NULL);
|
| expected->Set(key::kHomepageLocation,
|
| POLICY_LEVEL_RECOMMENDED,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_CLOUD,
|
| new base::StringValue(homepage),
|
| NULL);
|
| #if defined(OS_CHROMEOS)
|
| expected->Set(key::kChromeOsMultiProfileUserBehavior,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::StringValue("primary-only"),
|
| NULL);
|
| expected->Set(key::kEasyUnlockAllowed,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::FundamentalValue(false),
|
| NULL);
|
| expected->Set(key::kCaptivePortalAuthenticationIgnoresProxy,
|
| POLICY_LEVEL_MANDATORY,
|
| POLICY_SCOPE_USER,
|
| + POLICY_SOURCE_ENTERPRISE_DEFAULT,
|
| new base::FundamentalValue(false),
|
| NULL);
|
| #endif
|
|
|