| Index: chrome/browser/extensions/policy_handlers_unittest.cc
|
| diff --git a/chrome/browser/extensions/policy_handlers_unittest.cc b/chrome/browser/extensions/policy_handlers_unittest.cc
|
| index daa28a63f91c43f1efad2e18239d53b1b8f27487..a5fb83045a566ad9f5fbce5126ea7006f872aad3 100644
|
| --- a/chrome/browser/extensions/policy_handlers_unittest.cc
|
| +++ b/chrome/browser/extensions/policy_handlers_unittest.cc
|
| @@ -8,7 +8,6 @@
|
| #include "chrome/browser/extensions/policy_handlers.h"
|
| #include "components/policy/core/browser/policy_error_map.h"
|
| #include "components/policy/core/common/policy_map.h"
|
| -#include "components/policy/core/common/policy_types.h"
|
| #include "components/policy/core/common/schema.h"
|
| #include "extensions/browser/pref_names.h"
|
| #include "policy/policy_constants.h"
|
| @@ -44,7 +43,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -55,7 +53,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -66,7 +63,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -77,7 +73,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -102,7 +97,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -113,7 +107,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallBlacklist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -130,7 +123,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -141,7 +133,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -154,7 +145,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -166,7 +156,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -178,7 +167,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -201,7 +189,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -214,7 +201,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -225,7 +211,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallForcelist,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -243,7 +228,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -254,7 +238,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -265,7 +248,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -276,7 +258,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -290,7 +271,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| errors.Clear();
|
| @@ -311,7 +291,6 @@
|
| policy_map.Set(policy::key::kExtensionInstallSources,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| list.DeepCopy(),
|
| NULL);
|
| handler.ApplyPolicySettings(policy_map, &prefs);
|
| @@ -335,7 +314,6 @@
|
| policy_map.Set(policy::key::kExtensionSettings,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy_value.release(),
|
| NULL);
|
| // CheckPolicySettings() fails due to missing update URL.
|
| @@ -360,7 +338,6 @@
|
| policy_map.Set(policy::key::kExtensionSettings,
|
| policy::POLICY_LEVEL_MANDATORY,
|
| policy::POLICY_SCOPE_USER,
|
| - policy::POLICY_SOURCE_CLOUD,
|
| policy_value->DeepCopy(),
|
| NULL);
|
| EXPECT_TRUE(handler.CheckPolicySettings(policy_map, &errors));
|
|
|