Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8086)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/policy/configuration_policy_pref_store_unittest.cc

Issue 9111022: Removed ConfigurationPolicyType and extended PolicyMap. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/configuration_policy_provider.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/configuration_policy_pref_store_unittest.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
index 86bbe9f99b01ae1c782b0b9e9289db787cfd3f40..7e458de921dbddc036f8390a83fbdece814fd00e 100644
--- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc
@@ -6,6 +6,7 @@
#include "base/file_path.h"
#include "base/memory/ref_counted.h"
+#include "chrome/browser/policy/configuration_policy_handler.h"
#include "chrome/browser/policy/configuration_policy_pref_store.h"
#include "chrome/browser/policy/mock_configuration_policy_provider.h"
#include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ -13,6 +14,7 @@
#include "chrome/common/content_settings.h"
#include "chrome/common/pref_names.h"
#include "chrome/common/pref_store_observer_mock.h"
+#include "policy/policy_constants.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -21,18 +23,18 @@ using testing::Mock;
namespace policy {
-// Holds a set of test parameters, consisting of pref name and policy type.
-class TypeAndName {
+// Holds a set of test parameters, consisting of pref name and policy name.
+class PolicyAndPref {
public:
- TypeAndName(ConfigurationPolicyType type, const char* pref_name)
- : type_(type),
+ PolicyAndPref(const char* policy_name, const char* pref_name)
+ : policy_name_(policy_name),
pref_name_(pref_name) {}
- ConfigurationPolicyType type() const { return type_; }
+ const char* policy_name() const { return policy_name_; }
const char* pref_name() const { return pref_name_; }
private:
- ConfigurationPolicyType type_;
+ const char* policy_name_;
const char* pref_name_;
};
@@ -50,7 +52,7 @@ class ConfigurationPolicyPrefStoreTestBase : public TESTBASE {
// Test cases for list-valued policy settings.
class ConfigurationPolicyPrefStoreListTest
: public ConfigurationPolicyPrefStoreTestBase<
- testing::TestWithParam<TypeAndName> > {
+ testing::TestWithParam<PolicyAndPref> > {
};
TEST_P(ConfigurationPolicyPrefStoreListTest, GetDefault) {
@@ -62,7 +64,7 @@ TEST_P(ConfigurationPolicyPrefStoreListTest, SetValue) {
ListValue* in_value = new ListValue();
in_value->Append(Value::CreateStringValue("test1"));
in_value->Append(Value::CreateStringValue("test2,"));
- provider_.AddPolicy(GetParam().type(), in_value);
+ provider_.AddMandatoryPolicy(GetParam().policy_name(), in_value);
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -75,31 +77,31 @@ INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyPrefStoreListTestInstance,
ConfigurationPolicyPrefStoreListTest,
testing::Values(
- TypeAndName(kPolicyRestoreOnStartupURLs,
- prefs::kURLsToRestoreOnStartup),
- TypeAndName(kPolicyExtensionInstallWhitelist,
- prefs::kExtensionInstallAllowList),
- TypeAndName(kPolicyExtensionInstallBlacklist,
- prefs::kExtensionInstallDenyList),
- TypeAndName(kPolicyDisabledPlugins,
- prefs::kPluginsDisabledPlugins),
- TypeAndName(kPolicyDisabledPluginsExceptions,
- prefs::kPluginsDisabledPluginsExceptions),
- TypeAndName(kPolicyEnabledPlugins,
- prefs::kPluginsEnabledPlugins),
- TypeAndName(kPolicyDisabledSchemes,
- prefs::kDisabledSchemes),
- TypeAndName(kPolicyAutoSelectCertificateForUrls,
- prefs::kManagedAutoSelectCertificateForUrls),
- TypeAndName(kPolicyURLBlacklist,
- prefs::kUrlBlacklist),
- TypeAndName(kPolicyURLWhitelist,
- prefs::kUrlWhitelist)));
+ PolicyAndPref(key::kRestoreOnStartupURLs,
+ prefs::kURLsToRestoreOnStartup),
+ PolicyAndPref(key::kExtensionInstallWhitelist,
+ prefs::kExtensionInstallAllowList),
+ PolicyAndPref(key::kExtensionInstallBlacklist,
+ prefs::kExtensionInstallDenyList),
+ PolicyAndPref(key::kDisabledPlugins,
+ prefs::kPluginsDisabledPlugins),
+ PolicyAndPref(key::kDisabledPluginsExceptions,
+ prefs::kPluginsDisabledPluginsExceptions),
+ PolicyAndPref(key::kEnabledPlugins,
+ prefs::kPluginsEnabledPlugins),
+ PolicyAndPref(key::kDisabledSchemes,
+ prefs::kDisabledSchemes),
+ PolicyAndPref(key::kAutoSelectCertificateForUrls,
+ prefs::kManagedAutoSelectCertificateForUrls),
+ PolicyAndPref(key::kURLBlacklist,
+ prefs::kUrlBlacklist),
+ PolicyAndPref(key::kURLWhitelist,
+ prefs::kUrlWhitelist)));
// Test cases for string-valued policy settings.
class ConfigurationPolicyPrefStoreStringTest
: public ConfigurationPolicyPrefStoreTestBase<
- testing::TestWithParam<TypeAndName> > {
+ testing::TestWithParam<PolicyAndPref> > {
};
TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) {
@@ -108,8 +110,8 @@ TEST_P(ConfigurationPolicyPrefStoreStringTest, GetDefault) {
}
TEST_P(ConfigurationPolicyPrefStoreStringTest, SetValue) {
- provider_.AddPolicy(GetParam().type(),
- Value::CreateStringValue("http://chromium.org"));
+ provider_.AddMandatoryPolicy(GetParam().policy_name(),
+ Value::CreateStringValue("http://chromium.org"));
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -122,35 +124,33 @@ INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyPrefStoreStringTestInstance,
ConfigurationPolicyPrefStoreStringTest,
testing::Values(
- TypeAndName(kPolicyHomepageLocation,
- prefs::kHomePage),
- TypeAndName(kPolicyApplicationLocaleValue,
- prefs::kApplicationLocale),
- TypeAndName(kPolicyApplicationLocaleValue,
- prefs::kApplicationLocale),
- TypeAndName(kPolicyAuthSchemes,
- prefs::kAuthSchemes),
- TypeAndName(kPolicyAuthServerWhitelist,
- prefs::kAuthServerWhitelist),
- TypeAndName(kPolicyAuthNegotiateDelegateWhitelist,
- prefs::kAuthNegotiateDelegateWhitelist),
- TypeAndName(kPolicyGSSAPILibraryName,
- prefs::kGSSAPILibraryName),
- TypeAndName(kPolicyDiskCacheDir,
- prefs::kDiskCacheDir)));
+ PolicyAndPref(key::kHomepageLocation,
+ prefs::kHomePage),
+ PolicyAndPref(key::kApplicationLocaleValue,
+ prefs::kApplicationLocale),
+ PolicyAndPref(key::kAuthSchemes,
+ prefs::kAuthSchemes),
+ PolicyAndPref(key::kAuthServerWhitelist,
+ prefs::kAuthServerWhitelist),
+ PolicyAndPref(key::kAuthNegotiateDelegateWhitelist,
+ prefs::kAuthNegotiateDelegateWhitelist),
+ PolicyAndPref(key::kGSSAPILibraryName,
+ prefs::kGSSAPILibraryName),
+ PolicyAndPref(key::kDiskCacheDir,
+ prefs::kDiskCacheDir)));
#if !defined(OS_CHROMEOS)
INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyPrefStoreDownloadDirectoryInstance,
ConfigurationPolicyPrefStoreStringTest,
- testing::Values(TypeAndName(kPolicyDownloadDirectory,
- prefs::kDownloadDefaultDirectory)));
+ testing::Values(PolicyAndPref(key::kDownloadDirectory,
+ prefs::kDownloadDefaultDirectory)));
#endif // !defined(OS_CHROMEOS)
// Test cases for boolean-valued policy settings.
class ConfigurationPolicyPrefStoreBooleanTest
: public ConfigurationPolicyPrefStoreTestBase<
- testing::TestWithParam<TypeAndName> > {
+ testing::TestWithParam<PolicyAndPref> > {
};
TEST_P(ConfigurationPolicyPrefStoreBooleanTest, GetDefault) {
@@ -159,7 +159,8 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, GetDefault) {
}
TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
- provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(GetParam().policy_name(),
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -170,7 +171,8 @@ TEST_P(ConfigurationPolicyPrefStoreBooleanTest, SetValue) {
ASSERT_TRUE(result);
EXPECT_FALSE(boolean_value);
- provider_.AddPolicy(GetParam().type(), Value::CreateBooleanValue(true));
+ provider_.AddMandatoryPolicy(GetParam().policy_name(),
+ Value::CreateBooleanValue(true));
store_->OnUpdatePolicy(&provider_);
value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -185,98 +187,96 @@ INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyPrefStoreBooleanTestInstance,
ConfigurationPolicyPrefStoreBooleanTest,
testing::Values(
- TypeAndName(kPolicyHomepageIsNewTabPage,
- prefs::kHomePageIsNewTabPage),
- TypeAndName(kPolicyAlternateErrorPagesEnabled,
- prefs::kAlternateErrorPagesEnabled),
- TypeAndName(kPolicySearchSuggestEnabled,
- prefs::kSearchSuggestEnabled),
- TypeAndName(kPolicyDnsPrefetchingEnabled,
- prefs::kNetworkPredictionEnabled),
- TypeAndName(kPolicyDisableSpdy,
- prefs::kDisableSpdy),
- TypeAndName(kPolicySafeBrowsingEnabled,
- prefs::kSafeBrowsingEnabled),
- TypeAndName(kPolicyMetricsReportingEnabled,
- prefs::kMetricsReportingEnabled),
- TypeAndName(kPolicyPasswordManagerEnabled,
- prefs::kPasswordManagerEnabled),
- TypeAndName(kPolicyPasswordManagerAllowShowPasswords,
- prefs::kPasswordManagerAllowShowPasswords),
- TypeAndName(kPolicyShowHomeButton,
- prefs::kShowHomeButton),
- TypeAndName(kPolicyPrintingEnabled,
- prefs::kPrintingEnabled),
- TypeAndName(kPolicyRemoteAccessHostFirewallTraversal,
- prefs::kRemoteAccessHostFirewallTraversal),
- TypeAndName(kPolicyCloudPrintProxyEnabled,
- prefs::kCloudPrintProxyEnabled),
- TypeAndName(kPolicyCloudPrintSubmitEnabled,
- prefs::kCloudPrintSubmitEnabled),
- TypeAndName(kPolicySavingBrowserHistoryDisabled,
- prefs::kSavingBrowserHistoryDisabled),
- TypeAndName(kPolicySavingBrowserHistoryDisabled,
- prefs::kSavingBrowserHistoryDisabled),
- TypeAndName(kPolicyEnableOriginBoundCerts,
- prefs::kEnableOriginBoundCerts),
- TypeAndName(kPolicyDisableAuthNegotiateCnameLookup,
- prefs::kDisableAuthNegotiateCnameLookup),
- TypeAndName(kPolicyEnableAuthNegotiatePort,
- prefs::kEnableAuthNegotiatePort),
- TypeAndName(kPolicyInstantEnabled,
- prefs::kInstantEnabled),
- TypeAndName(kPolicyDisablePluginFinder,
- prefs::kDisablePluginFinder),
- TypeAndName(kPolicyClearSiteDataOnExit,
- prefs::kClearSiteDataOnExit),
- TypeAndName(kPolicyDefaultBrowserSettingEnabled,
- prefs::kDefaultBrowserSettingEnabled),
- TypeAndName(kPolicyDisable3DAPIs,
- prefs::kDisable3DAPIs),
- TypeAndName(kPolicyTranslateEnabled,
- prefs::kEnableTranslate),
- TypeAndName(kPolicyAllowOutdatedPlugins,
- prefs::kPluginsAllowOutdated),
- TypeAndName(kPolicyAlwaysAuthorizePlugins,
- prefs::kPluginsAlwaysAuthorize),
- TypeAndName(kPolicyBookmarkBarEnabled,
- prefs::kShowBookmarkBar),
- TypeAndName(kPolicyEditBookmarksEnabled,
- prefs::kEditBookmarksEnabled),
- TypeAndName(kPolicyAllowFileSelectionDialogs,
- prefs::kAllowFileSelectionDialogs),
- TypeAndName(kPolicyAllowCrossOriginAuthPrompt,
- prefs::kAllowCrossOriginAuthPrompt),
- TypeAndName(kPolicyImportBookmarks,
- prefs::kImportBookmarks),
- TypeAndName(kPolicyImportHistory,
- prefs::kImportHistory),
- TypeAndName(kPolicyImportHomepage,
- prefs::kImportHomepage),
- TypeAndName(kPolicyImportSearchEngine,
- prefs::kImportSearchEngine),
- TypeAndName(kPolicyImportSavedPasswords,
- prefs::kImportSavedPasswords),
- TypeAndName(kPolicyEnableMemoryInfo,
- prefs::kEnableMemoryInfo),
- TypeAndName(kPolicyDisablePrintPreview,
- prefs::kPrintPreviewDisabled),
- TypeAndName(kPolicyDeveloperToolsDisabled,
- prefs::kDevToolsDisabled)));
+ PolicyAndPref(key::kHomepageIsNewTabPage,
+ prefs::kHomePageIsNewTabPage),
+ PolicyAndPref(key::kAlternateErrorPagesEnabled,
+ prefs::kAlternateErrorPagesEnabled),
+ PolicyAndPref(key::kSearchSuggestEnabled,
+ prefs::kSearchSuggestEnabled),
+ PolicyAndPref(key::kDnsPrefetchingEnabled,
+ prefs::kNetworkPredictionEnabled),
+ PolicyAndPref(key::kDisableSpdy,
+ prefs::kDisableSpdy),
+ PolicyAndPref(key::kSafeBrowsingEnabled,
+ prefs::kSafeBrowsingEnabled),
+ PolicyAndPref(key::kMetricsReportingEnabled,
+ prefs::kMetricsReportingEnabled),
+ PolicyAndPref(key::kPasswordManagerEnabled,
+ prefs::kPasswordManagerEnabled),
+ PolicyAndPref(key::kPasswordManagerAllowShowPasswords,
+ prefs::kPasswordManagerAllowShowPasswords),
+ PolicyAndPref(key::kShowHomeButton,
+ prefs::kShowHomeButton),
+ PolicyAndPref(key::kPrintingEnabled,
+ prefs::kPrintingEnabled),
+ PolicyAndPref(key::kRemoteAccessHostFirewallTraversal,
+ prefs::kRemoteAccessHostFirewallTraversal),
+ PolicyAndPref(key::kCloudPrintProxyEnabled,
+ prefs::kCloudPrintProxyEnabled),
+ PolicyAndPref(key::kCloudPrintSubmitEnabled,
+ prefs::kCloudPrintSubmitEnabled),
+ PolicyAndPref(key::kSavingBrowserHistoryDisabled,
+ prefs::kSavingBrowserHistoryDisabled),
+ PolicyAndPref(key::kEnableOriginBoundCerts,
+ prefs::kEnableOriginBoundCerts),
+ PolicyAndPref(key::kDisableAuthNegotiateCnameLookup,
+ prefs::kDisableAuthNegotiateCnameLookup),
+ PolicyAndPref(key::kEnableAuthNegotiatePort,
+ prefs::kEnableAuthNegotiatePort),
+ PolicyAndPref(key::kInstantEnabled,
+ prefs::kInstantEnabled),
+ PolicyAndPref(key::kDisablePluginFinder,
+ prefs::kDisablePluginFinder),
+ PolicyAndPref(key::kClearSiteDataOnExit,
+ prefs::kClearSiteDataOnExit),
+ PolicyAndPref(key::kDefaultBrowserSettingEnabled,
+ prefs::kDefaultBrowserSettingEnabled),
+ PolicyAndPref(key::kDisable3DAPIs,
+ prefs::kDisable3DAPIs),
+ PolicyAndPref(key::kTranslateEnabled,
+ prefs::kEnableTranslate),
+ PolicyAndPref(key::kAllowOutdatedPlugins,
+ prefs::kPluginsAllowOutdated),
+ PolicyAndPref(key::kAlwaysAuthorizePlugins,
+ prefs::kPluginsAlwaysAuthorize),
+ PolicyAndPref(key::kBookmarkBarEnabled,
+ prefs::kShowBookmarkBar),
+ PolicyAndPref(key::kEditBookmarksEnabled,
+ prefs::kEditBookmarksEnabled),
+ PolicyAndPref(key::kAllowFileSelectionDialogs,
+ prefs::kAllowFileSelectionDialogs),
+ PolicyAndPref(key::kAllowCrossOriginAuthPrompt,
+ prefs::kAllowCrossOriginAuthPrompt),
+ PolicyAndPref(key::kImportBookmarks,
+ prefs::kImportBookmarks),
+ PolicyAndPref(key::kImportHistory,
+ prefs::kImportHistory),
+ PolicyAndPref(key::kImportHomepage,
+ prefs::kImportHomepage),
+ PolicyAndPref(key::kImportSearchEngine,
+ prefs::kImportSearchEngine),
+ PolicyAndPref(key::kImportSavedPasswords,
+ prefs::kImportSavedPasswords),
+ PolicyAndPref(key::kEnableMemoryInfo,
+ prefs::kEnableMemoryInfo),
+ PolicyAndPref(key::kDisablePrintPreview,
+ prefs::kPrintPreviewDisabled),
+ PolicyAndPref(key::kDeveloperToolsDisabled,
+ prefs::kDevToolsDisabled)));
#if defined(OS_CHROMEOS)
INSTANTIATE_TEST_CASE_P(
CrosConfigurationPolicyPrefStoreBooleanTestInstance,
ConfigurationPolicyPrefStoreBooleanTest,
testing::Values(
- TypeAndName(kPolicyChromeOsLockOnIdleSuspend,
- prefs::kEnableScreenLock)));
+ PolicyAndPref(key::kChromeOsLockOnIdleSuspend,
+ prefs::kEnableScreenLock)));
#endif // defined(OS_CHROMEOS)
// Test cases for integer-valued policy settings.
class ConfigurationPolicyPrefStoreIntegerTest
: public ConfigurationPolicyPrefStoreTestBase<
- testing::TestWithParam<TypeAndName> > {
+ testing::TestWithParam<PolicyAndPref> > {
};
TEST_P(ConfigurationPolicyPrefStoreIntegerTest, GetDefault) {
@@ -285,7 +285,8 @@ TEST_P(ConfigurationPolicyPrefStoreIntegerTest, GetDefault) {
}
TEST_P(ConfigurationPolicyPrefStoreIntegerTest, SetValue) {
- provider_.AddPolicy(GetParam().type(), Value::CreateIntegerValue(2));
+ provider_.AddMandatoryPolicy(GetParam().policy_name(),
+ Value::CreateIntegerValue(2));
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -297,28 +298,28 @@ INSTANTIATE_TEST_CASE_P(
ConfigurationPolicyPrefStoreIntegerTestInstance,
ConfigurationPolicyPrefStoreIntegerTest,
testing::Values(
- TypeAndName(kPolicyDefaultCookiesSetting,
- prefs::kManagedDefaultCookiesSetting),
- TypeAndName(kPolicyDefaultImagesSetting,
- prefs::kManagedDefaultImagesSetting),
- TypeAndName(kPolicyDefaultPluginsSetting,
- prefs::kManagedDefaultPluginsSetting),
- TypeAndName(kPolicyDefaultPopupsSetting,
- prefs::kManagedDefaultPopupsSetting),
- TypeAndName(kPolicyDefaultNotificationsSetting,
- prefs::kManagedDefaultNotificationsSetting),
- TypeAndName(kPolicyDefaultGeolocationSetting,
- prefs::kManagedDefaultGeolocationSetting),
- TypeAndName(kPolicyRestoreOnStartup,
- prefs::kRestoreOnStartup),
- TypeAndName(kPolicyDiskCacheSize,
- prefs::kDiskCacheSize),
- TypeAndName(kPolicyMediaCacheSize,
- prefs::kMediaCacheSize),
- TypeAndName(kPolicyPolicyRefreshRate,
- prefs::kUserPolicyRefreshRate),
- TypeAndName(kPolicyMaxConnectionsPerProxy,
- prefs::kMaxConnectionsPerProxy)));
+ PolicyAndPref(key::kDefaultCookiesSetting,
+ prefs::kManagedDefaultCookiesSetting),
+ PolicyAndPref(key::kDefaultImagesSetting,
+ prefs::kManagedDefaultImagesSetting),
+ PolicyAndPref(key::kDefaultPluginsSetting,
+ prefs::kManagedDefaultPluginsSetting),
+ PolicyAndPref(key::kDefaultPopupsSetting,
+ prefs::kManagedDefaultPopupsSetting),
+ PolicyAndPref(key::kDefaultNotificationsSetting,
+ prefs::kManagedDefaultNotificationsSetting),
+ PolicyAndPref(key::kDefaultGeolocationSetting,
+ prefs::kManagedDefaultGeolocationSetting),
+ PolicyAndPref(key::kRestoreOnStartup,
+ prefs::kRestoreOnStartup),
+ PolicyAndPref(key::kDiskCacheSize,
+ prefs::kDiskCacheSize),
+ PolicyAndPref(key::kMediaCacheSize,
+ prefs::kMediaCacheSize),
+ PolicyAndPref(key::kPolicyRefreshRate,
+ prefs::kUserPolicyRefreshRate),
+ PolicyAndPref(key::kMaxConnectionsPerProxy,
+ prefs::kMaxConnectionsPerProxy)));
// Test cases for the proxy policy settings.
class ConfigurationPolicyPrefStoreProxyTest : public testing::Test {
@@ -362,13 +363,15 @@ class ConfigurationPolicyPrefStoreProxyTest : public testing::Test {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyBypassList,
- Value::CreateStringValue("http://chromium.org/override"));
- provider.AddPolicy(kPolicyProxyServer,
- Value::CreateStringValue("chromium.org"));
- provider.AddPolicy(kPolicyProxyServerMode,
- Value::CreateIntegerValue(
- kPolicyManuallyConfiguredProxyServerMode));
+ provider.AddMandatoryPolicy(
+ key::kProxyBypassList,
+ Value::CreateStringValue("http://chromium.org/override"));
+ provider.AddMandatoryPolicy(key::kProxyServer,
+ Value::CreateStringValue("chromium.org"));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -379,13 +382,16 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptions) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServerMode,
- Value::CreateIntegerValue(
- kPolicyManuallyConfiguredProxyServerMode));
- provider.AddPolicy(kPolicyProxyBypassList,
- Value::CreateStringValue("http://chromium.org/override"));
- provider.AddPolicy(kPolicyProxyServer,
- Value::CreateStringValue("chromium.org"));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
+ provider.AddMandatoryPolicy(
+ key::kProxyBypassList,
+ Value::CreateStringValue("http://chromium.org/override"));
+ provider.AddMandatoryPolicy(
+ key::kProxyServer,
+ Value::CreateStringValue("chromium.org"));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
VerifyProxyPrefs(
@@ -395,9 +401,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsReversedApplyOrder) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServerMode,
- Value::CreateIntegerValue(
- kPolicyManuallyConfiguredProxyServerMode));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(
+ ProxyPolicyHandler::PROXY_MANUALLY_CONFIGURED_PROXY_SERVER_MODE));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -408,8 +415,9 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, ManualOptionsInvalid) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServerMode,
- Value::CreateIntegerValue(kPolicyNoProxyServerMode));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(ProxyPolicyHandler::PROXY_SERVER_MODE));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -418,8 +426,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyServerMode) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kDirectProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -429,9 +437,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, NoProxyModeName) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyServerMode,
- Value::CreateIntegerValue(kPolicyAutoDetectProxyServerMode));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(
+ ProxyPolicyHandler::PROXY_AUTO_DETECT_PROXY_SERVER_MODE));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -440,8 +449,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyServerMode) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -451,10 +460,11 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, AutoDetectProxyModeName) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyPacUrl,
- Value::CreateStringValue("http://short.org/proxy.pac"));
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyPacUrl,
+ Value::CreateStringValue("http://short.org/proxy.pac"));
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -465,8 +475,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyMode) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -479,12 +489,13 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeInvalid) {
// for unset properties.
TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServer,
- Value::CreateStringValue(""));
- provider.AddPolicy(kPolicyProxyPacUrl,
- Value::CreateStringValue("http://short.org/proxy.pac"));
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(key::kProxyServer,
+ Value::CreateStringValue(""));
+ provider.AddMandatoryPolicy(
+ key::kProxyPacUrl,
+ Value::CreateStringValue("http://short.org/proxy.pac"));
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kPacScriptProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -495,9 +506,10 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, PacScriptProxyModeBug78016) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyServerMode,
- Value::CreateIntegerValue(kPolicyUseSystemProxyServerMode));
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(
+ ProxyPolicyHandler::PROXY_USE_SYSTEM_PROXY_SERVER_MODE));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -506,8 +518,8 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyServerMode) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kSystemProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -518,10 +530,11 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest, UseSystemProxyMode) {
TEST_F(ConfigurationPolicyPrefStoreProxyTest,
ProxyModeOverridesProxyServerMode) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServerMode,
- Value::CreateIntegerValue(kPolicyNoProxyServerMode));
- provider.AddPolicy(
- kPolicyProxyMode,
+ provider.AddMandatoryPolicy(
+ key::kProxyServerMode,
+ Value::CreateIntegerValue(ProxyPolicyHandler::PROXY_SERVER_MODE));
+ provider.AddMandatoryPolicy(
+ key::kProxyMode,
Value::CreateStringValue(ProxyPrefs::kAutoDetectProxyModeName));
scoped_refptr<ConfigurationPolicyPrefStore> store(
@@ -530,17 +543,19 @@ TEST_F(ConfigurationPolicyPrefStoreProxyTest,
}
TEST_F(ConfigurationPolicyPrefStoreProxyTest, ProxyInvalid) {
- for (int i = 0; i < MODE_COUNT; ++i) {
+ for (int i = 0; i < ProxyPolicyHandler::MODE_COUNT; ++i) {
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyProxyServerMode, Value::CreateIntegerValue(i));
+ provider.AddMandatoryPolicy(key::kProxyServerMode,
+ Value::CreateIntegerValue(i));
// No mode expects all three parameters being set.
- provider.AddPolicy(kPolicyProxyPacUrl,
- Value::CreateStringValue("http://short.org/proxy.pac"));
- provider.AddPolicy(kPolicyProxyBypassList,
- Value::CreateStringValue(
- "http://chromium.org/override"));
- provider.AddPolicy(kPolicyProxyServer,
- Value::CreateStringValue("chromium.org"));
+ provider.AddMandatoryPolicy(
+ key::kProxyPacUrl,
+ Value::CreateStringValue("http://short.org/proxy.pac"));
+ provider.AddMandatoryPolicy(
+ key::kProxyBypassList,
+ Value::CreateStringValue("http://chromium.org/override"));
+ provider.AddMandatoryPolicy(key::kProxyServer,
+ Value::CreateStringValue("chromium.org"));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -558,10 +573,10 @@ class ConfigurationPolicyPrefStoreDefaultSearchTest : public testing::Test {
TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MinimallyDefined) {
const char* const search_url = "http://test.com/search?t={searchTerms}";
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
- provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
- Value::CreateStringValue(search_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEnabled,
+ Value::CreateBooleanValue(true));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSearchURL,
+ Value::CreateStringValue(search_url));
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -608,19 +623,19 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, FullyDefined) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
- provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
- Value::CreateStringValue(search_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderName,
- Value::CreateStringValue(name));
- provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
- Value::CreateStringValue(keyword));
- provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
- Value::CreateStringValue(suggest_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
- Value::CreateStringValue(icon_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEnabled,
+ Value::CreateBooleanValue(true));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSearchURL,
+ Value::CreateStringValue(search_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderName,
+ Value::CreateStringValue(name));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderKeyword,
+ Value::CreateStringValue(keyword));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSuggestURL,
+ Value::CreateStringValue(suggest_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderIconURL,
+ Value::CreateStringValue(icon_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEncodings, encodings);
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -662,17 +677,17 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, MissingUrl) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
- provider.AddPolicy(kPolicyDefaultSearchProviderName,
- Value::CreateStringValue(name));
- provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
- Value::CreateStringValue(keyword));
- provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
- Value::CreateStringValue(suggest_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
- Value::CreateStringValue(icon_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEnabled,
+ Value::CreateBooleanValue(true));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderName,
+ Value::CreateStringValue(name));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderKeyword,
+ Value::CreateStringValue(keyword));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSuggestURL,
+ Value::CreateStringValue(suggest_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderIconURL,
+ Value::CreateStringValue(icon_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEncodings, encodings);
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -703,19 +718,19 @@ TEST_F(ConfigurationPolicyPrefStoreDefaultSearchTest, Invalid) {
encodings->Append(Value::CreateStringValue("UTF-16"));
encodings->Append(Value::CreateStringValue("UTF-8"));
MockConfigurationPolicyProvider provider;
- provider.AddPolicy(kPolicyDefaultSearchProviderEnabled,
- Value::CreateBooleanValue(true));
- provider.AddPolicy(kPolicyDefaultSearchProviderSearchURL,
- Value::CreateStringValue(bad_search_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderName,
- Value::CreateStringValue(name));
- provider.AddPolicy(kPolicyDefaultSearchProviderKeyword,
- Value::CreateStringValue(keyword));
- provider.AddPolicy(kPolicyDefaultSearchProviderSuggestURL,
- Value::CreateStringValue(suggest_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderIconURL,
- Value::CreateStringValue(icon_url));
- provider.AddPolicy(kPolicyDefaultSearchProviderEncodings, encodings);
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEnabled,
+ Value::CreateBooleanValue(true));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSearchURL,
+ Value::CreateStringValue(bad_search_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderName,
+ Value::CreateStringValue(name));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderKeyword,
+ Value::CreateStringValue(keyword));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderSuggestURL,
+ Value::CreateStringValue(suggest_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderIconURL,
+ Value::CreateStringValue(icon_url));
+ provider.AddMandatoryPolicy(key::kDefaultSearchProviderEncodings, encodings);
scoped_refptr<ConfigurationPolicyPrefStore> store(
new ConfigurationPolicyPrefStore(&provider));
@@ -748,13 +763,14 @@ class ConfigurationPolicyPrefStoreIncognitoModeTest : public testing::Test {
void SetPolicies(ObsoleteIncognitoEnabledValue incognito_enabled,
int availability) {
if (incognito_enabled != INCOGNITO_ENABLED_UNKNOWN) {
- provider_.AddPolicy(kPolicyIncognitoEnabled,
- Value::CreateBooleanValue(
- incognito_enabled == INCOGNITO_ENABLED_TRUE));
+ provider_.AddMandatoryPolicy(
+ key::kIncognitoEnabled,
+ Value::CreateBooleanValue(
+ incognito_enabled == INCOGNITO_ENABLED_TRUE));
}
if (availability >= 0) {
- provider_.AddPolicy(kPolicyIncognitoModeAvailability,
- Value::CreateIntegerValue(availability));
+ provider_.AddMandatoryPolicy(key::kIncognitoModeAvailability,
+ Value::CreateIntegerValue(availability));
}
store_ = new ConfigurationPolicyPrefStore(&provider_);
}
@@ -837,7 +853,8 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Default) {
}
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
- provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(key::kSyncDisabled,
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
// Enabling Sync should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
@@ -845,7 +862,8 @@ TEST_F(ConfigurationPolicyPrefStoreSyncTest, Enabled) {
}
TEST_F(ConfigurationPolicyPrefStoreSyncTest, Disabled) {
- provider_.AddPolicy(kPolicySyncDisabled, Value::CreateBooleanValue(true));
+ provider_.AddMandatoryPolicy(key::kSyncDisabled,
+ Value::CreateBooleanValue(true));
store_->OnUpdatePolicy(&provider_);
// Sync should be flagged as managed.
const Value* value = NULL;
@@ -872,7 +890,8 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, Default) {
TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest, SetDownloadDirectory) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
- provider_.AddPolicy(kPolicyDownloadDirectory, Value::CreateStringValue(""));
+ provider_.AddMandatoryPolicy(key::kDownloadDirectory,
+ Value::CreateStringValue(""));
store_->OnUpdatePolicy(&provider_);
// Setting a DownloadDirectory should disable the PromptForDownload pref.
@@ -891,8 +910,8 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
EnableFileSelectionDialogs) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
- provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
- Value::CreateBooleanValue(true));
+ provider_.AddMandatoryPolicy(key::kAllowFileSelectionDialogs,
+ Value::CreateBooleanValue(true));
store_->OnUpdatePolicy(&provider_);
// Allowing file-selection dialogs should not influence the PromptForDownload
@@ -905,8 +924,8 @@ TEST_F(ConfigurationPolicyPrefStorePromptDownloadTest,
DisableFileSelectionDialogs) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kPromptForDownload, NULL));
- provider_.AddPolicy(kPolicyAllowFileSelectionDialogs,
- Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(key::kAllowFileSelectionDialogs,
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
// Disabling file-selection dialogs should disable the PromptForDownload pref.
@@ -931,7 +950,8 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Default) {
}
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
- provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(true));
+ provider_.AddMandatoryPolicy(key::kAutoFillEnabled,
+ Value::CreateBooleanValue(true));
store_->OnUpdatePolicy(&provider_);
// Enabling Autofill should not set the pref.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
@@ -939,7 +959,8 @@ TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Enabled) {
}
TEST_F(ConfigurationPolicyPrefStoreAutofillTest, Disabled) {
- provider_.AddPolicy(kPolicyAutoFillEnabled, Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(key::kAutoFillEnabled,
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
// Disabling Autofill should switch the pref to managed.
const Value* value = NULL;
@@ -973,8 +994,9 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
store_->GetValue(prefs::kHomePage, NULL));
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
- provider_.AddPolicy(kPolicyHomepageLocation,
- Value::CreateStringValue("http://www.chromium.org"));
+ provider_.AddMandatoryPolicy(
+ key::kHomepageLocation,
+ Value::CreateStringValue("http://www.chromium.org"));
store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_EQ(PrefStore::READ_OK,
@@ -986,7 +1008,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) {
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1);
- provider_.RemovePolicy(kPolicyHomepageLocation);
+ provider_.RemovePolicy(key::kHomepageLocation);
store_->OnUpdatePolicy(&provider_);
Mock::VerifyAndClearExpectations(&observer_);
EXPECT_EQ(PrefStore::READ_NO_VALUE,
@@ -1015,13 +1037,13 @@ TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabled) {
// This is a boolean policy, but affects an integer preference.
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
- provider_.AddPolicy(kPolicyJavascriptEnabled,
- Value::CreateBooleanValue(true));
+ provider_.AddMandatoryPolicy(key::kJavascriptEnabled,
+ Value::CreateBooleanValue(true));
store_->OnUpdatePolicy(&provider_);
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
- provider_.AddPolicy(kPolicyJavascriptEnabled,
- Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(key::kJavascriptEnabled,
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
@@ -1032,16 +1054,17 @@ TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabled) {
TEST_F(ConfigurationPolicyPrefStoreOthersTest, JavascriptEnabledOverridden) {
EXPECT_EQ(PrefStore::READ_NO_VALUE,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, NULL));
- provider_.AddPolicy(kPolicyJavascriptEnabled,
- Value::CreateBooleanValue(false));
+ provider_.AddMandatoryPolicy(key::kJavascriptEnabled,
+ Value::CreateBooleanValue(false));
store_->OnUpdatePolicy(&provider_);
const Value* value = NULL;
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
EXPECT_TRUE(base::FundamentalValue(CONTENT_SETTING_BLOCK).Equals(value));
// DefaultJavaScriptSetting overrides JavascriptEnabled.
- provider_.AddPolicy(kPolicyDefaultJavaScriptSetting,
- Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+ provider_.AddMandatoryPolicy(
+ key::kDefaultJavaScriptSetting,
+ Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
store_->OnUpdatePolicy(&provider_);
EXPECT_EQ(PrefStore::READ_OK,
store_->GetValue(prefs::kManagedDefaultJavaScriptSetting, &value));
« no previous file with comments | « chrome/browser/policy/configuration_policy_pref_store.cc ('k') | chrome/browser/policy/configuration_policy_provider.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698