diff options
Diffstat (limited to 'chrome/browser')
11 files changed, 60 insertions, 117 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 1cf13fc..757e0b4 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -8,6 +8,7 @@ include_rules = [ "+chrome/tools/profiles", # For history unit tests. "+chrome/views", "+grit", # For generated headers + "+policy", # For generated headers and source "+ppapi/c", # For various types. "+ppapi/proxy", "+rlz", diff --git a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc index c6aee70..9d186b8 100644 --- a/chrome/browser/policy/asynchronous_policy_provider_unittest.cc +++ b/chrome/browser/policy/asynchronous_policy_provider_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/policy/asynchronous_policy_test_base.h" #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" -#include "chrome/common/policy_constants.h" +#include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/config_dir_policy_provider_unittest.cc b/chrome/browser/policy/config_dir_policy_provider_unittest.cc index 67ac917..4bfd49f 100644 --- a/chrome/browser/policy/config_dir_policy_provider_unittest.cc +++ b/chrome/browser/policy/config_dir_policy_provider_unittest.cc @@ -13,7 +13,7 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" #include "chrome/common/json_value_serializer.h" -#include "chrome/common/policy_constants.h" +#include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { @@ -226,7 +226,7 @@ INSTANTIATE_TEST_CASE_P( ConfigDirPolicyProviderValueTest, testing::Values( ValueTestParams::ForStringPolicy( - kPolicyHomePage, + kPolicyHomepageLocation, key::kHomepageLocation), ValueTestParams::ForBooleanPolicy( kPolicyHomepageIsNewTabPage, @@ -235,8 +235,8 @@ INSTANTIATE_TEST_CASE_P( kPolicyRestoreOnStartup, key::kRestoreOnStartup), ValueTestParams::ForListPolicy( - kPolicyURLsToRestoreOnStartup, - key::kURLsToRestoreOnStartup), + kPolicyRestoreOnStartupURLs, + key::kRestoreOnStartupURLs), ValueTestParams::ForBooleanPolicy( kPolicyDefaultSearchProviderEnabled, key::kDefaultSearchProviderEnabled), @@ -304,17 +304,17 @@ INSTANTIATE_TEST_CASE_P( kPolicyAutoFillEnabled, key::kAutoFillEnabled), ValueTestParams::ForStringPolicy( - kPolicyApplicationLocale, + kPolicyApplicationLocaleValue, key::kApplicationLocaleValue), ValueTestParams::ForBooleanPolicy( kPolicySyncDisabled, key::kSyncDisabled), ValueTestParams::ForListPolicy( - kPolicyExtensionInstallAllowList, - key::kExtensionInstallAllowList), + kPolicyExtensionInstallWhitelist, + key::kExtensionInstallWhitelist), ValueTestParams::ForListPolicy( - kPolicyExtensionInstallDenyList, - key::kExtensionInstallDenyList), + kPolicyExtensionInstallBlacklist, + key::kExtensionInstallBlacklist), ValueTestParams::ForBooleanPolicy( kPolicyShowHomeButton, key::kShowHomeButton), diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc index 2d4ab5f..9f00c51 100644 --- a/chrome/browser/policy/configuration_policy_pref_store.cc +++ b/chrome/browser/policy/configuration_policy_pref_store.cc @@ -28,8 +28,8 @@ #include "chrome/browser/search_engines/search_terms_data.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/common/notification_service.h" -#include "chrome/common/policy_constants.h" #include "chrome/common/pref_names.h" +#include "policy/policy_constants.h" namespace policy { @@ -150,12 +150,12 @@ class ConfigurationPolicyPrefKeeper const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry ConfigurationPolicyPrefKeeper::kSimplePolicyMap[] = { - { Value::TYPE_STRING, kPolicyHomePage, prefs::kHomePage }, + { Value::TYPE_STRING, kPolicyHomepageLocation, prefs::kHomePage }, { Value::TYPE_BOOLEAN, kPolicyHomepageIsNewTabPage, prefs::kHomePageIsNewTabPage }, { Value::TYPE_INTEGER, kPolicyRestoreOnStartup, prefs::kRestoreOnStartup}, - { Value::TYPE_LIST, kPolicyURLsToRestoreOnStartup, + { Value::TYPE_LIST, kPolicyRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup }, { Value::TYPE_BOOLEAN, kPolicyAlternateErrorPagesEnabled, prefs::kAlternateErrorPagesEnabled }, @@ -175,13 +175,13 @@ const ConfigurationPolicyPrefKeeper::PolicyToPreferenceMapEntry prefs::kPrintingEnabled }, { Value::TYPE_BOOLEAN, kPolicyMetricsReportingEnabled, prefs::kMetricsReportingEnabled }, - { Value::TYPE_STRING, kPolicyApplicationLocale, + { Value::TYPE_STRING, kPolicyApplicationLocaleValue, prefs::kApplicationLocale}, - { Value::TYPE_LIST, kPolicyExtensionInstallAllowList, + { Value::TYPE_LIST, kPolicyExtensionInstallWhitelist, prefs::kExtensionInstallAllowList}, - { Value::TYPE_LIST, kPolicyExtensionInstallDenyList, + { Value::TYPE_LIST, kPolicyExtensionInstallBlacklist, prefs::kExtensionInstallDenyList}, - { Value::TYPE_LIST, kPolicyExtensionInstallForceList, + { Value::TYPE_LIST, kPolicyExtensionInstallForcelist, prefs::kExtensionInstallForceList}, { Value::TYPE_LIST, kPolicyDisabledPlugins, prefs::kPluginsPluginsBlacklist}, @@ -747,12 +747,12 @@ ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore() { const ConfigurationPolicyProvider::PolicyDefinitionList* ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { static ConfigurationPolicyProvider::PolicyDefinitionList::Entry entries[] = { - { kPolicyHomePage, Value::TYPE_STRING, key::kHomepageLocation }, + { kPolicyHomepageLocation, Value::TYPE_STRING, key::kHomepageLocation }, { kPolicyHomepageIsNewTabPage, Value::TYPE_BOOLEAN, key::kHomepageIsNewTabPage }, { kPolicyRestoreOnStartup, Value::TYPE_INTEGER, key::kRestoreOnStartup }, - { kPolicyURLsToRestoreOnStartup, Value::TYPE_LIST, - key::kURLsToRestoreOnStartup }, + { kPolicyRestoreOnStartupURLs, Value::TYPE_LIST, + key::kRestoreOnStartupURLs }, { kPolicyDefaultSearchProviderEnabled, Value::TYPE_BOOLEAN, key::kDefaultSearchProviderEnabled }, { kPolicyDefaultSearchProviderName, Value::TYPE_STRING, @@ -791,15 +791,15 @@ ConfigurationPolicyPrefStore::GetChromePolicyDefinitionList() { key::kPasswordManagerAllowShowPasswords }, { kPolicyAutoFillEnabled, Value::TYPE_BOOLEAN, key::kAutoFillEnabled }, { kPolicyDisabledPlugins, Value::TYPE_LIST, key::kDisabledPlugins }, - { kPolicyApplicationLocale, Value::TYPE_STRING, + { kPolicyApplicationLocaleValue, Value::TYPE_STRING, key::kApplicationLocaleValue }, { kPolicySyncDisabled, Value::TYPE_BOOLEAN, key::kSyncDisabled }, - { kPolicyExtensionInstallAllowList, Value::TYPE_LIST, - key::kExtensionInstallAllowList }, - { kPolicyExtensionInstallDenyList, Value::TYPE_LIST, - key::kExtensionInstallDenyList }, - { kPolicyExtensionInstallForceList, Value::TYPE_LIST, - key::kExtensionInstallForceList }, + { kPolicyExtensionInstallWhitelist, Value::TYPE_LIST, + key::kExtensionInstallWhitelist }, + { kPolicyExtensionInstallBlacklist, Value::TYPE_LIST, + key::kExtensionInstallBlacklist }, + { kPolicyExtensionInstallForcelist, Value::TYPE_LIST, + key::kExtensionInstallForcelist }, { kPolicyShowHomeButton, Value::TYPE_BOOLEAN, key::kShowHomeButton }, { kPolicyPrintingEnabled, Value::TYPE_BOOLEAN, key::kPrintingEnabled }, { kPolicyJavascriptEnabled, Value::TYPE_BOOLEAN, key::kJavascriptEnabled }, diff --git a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc index 0ad9eb6d..759591a 100644 --- a/chrome/browser/policy/configuration_policy_pref_store_unittest.cc +++ b/chrome/browser/policy/configuration_policy_pref_store_unittest.cc @@ -71,11 +71,11 @@ INSTANTIATE_TEST_CASE_P( ConfigurationPolicyPrefStoreListTestInstance, ConfigurationPolicyPrefStoreListTest, testing::Values( - TypeAndName(kPolicyURLsToRestoreOnStartup, + TypeAndName(kPolicyRestoreOnStartupURLs, prefs::kURLsToRestoreOnStartup), - TypeAndName(kPolicyExtensionInstallAllowList, + TypeAndName(kPolicyExtensionInstallWhitelist, prefs::kExtensionInstallAllowList), - TypeAndName(kPolicyExtensionInstallDenyList, + TypeAndName(kPolicyExtensionInstallBlacklist, prefs::kExtensionInstallDenyList), TypeAndName(kPolicyDisabledPlugins, prefs::kPluginsPluginsBlacklist))); @@ -105,11 +105,11 @@ INSTANTIATE_TEST_CASE_P( ConfigurationPolicyPrefStoreStringTestInstance, ConfigurationPolicyPrefStoreStringTest, testing::Values( - TypeAndName(kPolicyHomePage, + TypeAndName(kPolicyHomepageLocation, prefs::kHomePage), - TypeAndName(kPolicyApplicationLocale, + TypeAndName(kPolicyApplicationLocaleValue, prefs::kApplicationLocale), - TypeAndName(kPolicyApplicationLocale, + TypeAndName(kPolicyApplicationLocaleValue, prefs::kApplicationLocale), TypeAndName(kPolicyAuthSchemes, prefs::kAuthSchemes), @@ -670,7 +670,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) { store_->GetValue(prefs::kHomePage, NULL)); EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1); - provider_.AddPolicy(kPolicyHomePage, + provider_.AddPolicy(kPolicyHomepageLocation, Value::CreateStringValue("http://www.chromium.org")); store_->OnUpdatePolicy(); Mock::VerifyAndClearExpectations(&observer_); @@ -683,7 +683,7 @@ TEST_F(ConfigurationPolicyPrefStoreRefreshTest, Refresh) { Mock::VerifyAndClearExpectations(&observer_); EXPECT_CALL(observer_, OnPrefValueChanged(prefs::kHomePage)).Times(1); - provider_.RemovePolicy(kPolicyHomePage); + provider_.RemovePolicy(kPolicyHomepageLocation); store_->OnUpdatePolicy(); Mock::VerifyAndClearExpectations(&observer_); EXPECT_EQ(PrefStore::READ_NO_VALUE, diff --git a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc index 1f2f467..7e93486 100644 --- a/chrome/browser/policy/configuration_policy_provider_delegate_win.cc +++ b/chrome/browser/policy/configuration_policy_provider_delegate_win.cc @@ -7,7 +7,7 @@ #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/win/registry.h" -#include "chrome/common/policy_constants.h" +#include "policy/policy_constants.h" using base::win::RegKey; diff --git a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc index d221f9a..c0f1e30 100644 --- a/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_mac_unittest.cc @@ -11,7 +11,7 @@ #include "chrome/browser/policy/configuration_policy_provider_mac.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" #include "chrome/browser/preferences_mock_mac.h" -#include "chrome/common/policy_constants.h" +#include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" namespace policy { @@ -200,7 +200,7 @@ INSTANTIATE_TEST_CASE_P( ConfigurationPolicyProviderMacTest, testing::Values( PolicyTestParams::ForStringPolicy( - kPolicyHomePage, + kPolicyHomepageLocation, key::kHomepageLocation), PolicyTestParams::ForBooleanPolicy( kPolicyHomepageIsNewTabPage, @@ -209,8 +209,8 @@ INSTANTIATE_TEST_CASE_P( kPolicyRestoreOnStartup, key::kRestoreOnStartup), PolicyTestParams::ForListPolicy( - kPolicyURLsToRestoreOnStartup, - key::kURLsToRestoreOnStartup), + kPolicyRestoreOnStartupURLs, + key::kRestoreOnStartupURLs), PolicyTestParams::ForBooleanPolicy( kPolicyDefaultSearchProviderEnabled, key::kDefaultSearchProviderEnabled), @@ -278,17 +278,17 @@ INSTANTIATE_TEST_CASE_P( kPolicyAutoFillEnabled, key::kAutoFillEnabled), PolicyTestParams::ForStringPolicy( - kPolicyApplicationLocale, + kPolicyApplicationLocaleValue, key::kApplicationLocaleValue), PolicyTestParams::ForBooleanPolicy( kPolicySyncDisabled, key::kSyncDisabled), PolicyTestParams::ForListPolicy( - kPolicyExtensionInstallAllowList, - key::kExtensionInstallAllowList), + kPolicyExtensionInstallWhitelist, + key::kExtensionInstallWhitelist), PolicyTestParams::ForListPolicy( - kPolicyExtensionInstallDenyList, - key::kExtensionInstallDenyList), + kPolicyExtensionInstallBlacklist, + key::kExtensionInstallBlacklist), PolicyTestParams::ForBooleanPolicy( kPolicyShowHomeButton, key::kShowHomeButton), diff --git a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc index 1d2a9ee..eed2c06 100644 --- a/chrome/browser/policy/configuration_policy_provider_win_unittest.cc +++ b/chrome/browser/policy/configuration_policy_provider_win_unittest.cc @@ -17,8 +17,8 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/configuration_policy_provider_win.h" #include "chrome/browser/policy/mock_configuration_policy_store.h" -#include "chrome/common/policy_constants.h" #include "chrome/common/pref_names.h" +#include "policy/policy_constants.h" #include "testing/gtest/include/gtest/gtest.h" using base::win::RegKey; @@ -358,7 +358,7 @@ INSTANTIATE_TEST_CASE_P( ConfigurationPolicyProviderWinTest, testing::Values( PolicyTestParams::ForStringPolicy( - kPolicyHomePage, + kPolicyHomepageLocation, key::kHomepageLocation), PolicyTestParams::ForBooleanPolicy( kPolicyHomepageIsNewTabPage, @@ -367,8 +367,8 @@ INSTANTIATE_TEST_CASE_P( kPolicyRestoreOnStartup, key::kRestoreOnStartup), PolicyTestParams::ForListPolicy( - kPolicyURLsToRestoreOnStartup, - key::kURLsToRestoreOnStartup), + kPolicyRestoreOnStartupURLs, + key::kRestoreOnStartupURLs), PolicyTestParams::ForBooleanPolicy( kPolicyDefaultSearchProviderEnabled, key::kDefaultSearchProviderEnabled), @@ -436,14 +436,14 @@ INSTANTIATE_TEST_CASE_P( kPolicySyncDisabled, key::kSyncDisabled), PolicyTestParams::ForStringPolicy( - kPolicyApplicationLocale, + kPolicyApplicationLocaleValue, key::kApplicationLocaleValue), PolicyTestParams::ForListPolicy( - kPolicyExtensionInstallAllowList, - key::kExtensionInstallAllowList), + kPolicyExtensionInstallWhitelist, + key::kExtensionInstallWhitelist), PolicyTestParams::ForListPolicy( - kPolicyExtensionInstallDenyList, - key::kExtensionInstallDenyList), + kPolicyExtensionInstallBlacklist, + key::kExtensionInstallBlacklist), PolicyTestParams::ForBooleanPolicy( kPolicyShowHomeButton, key::kShowHomeButton), diff --git a/chrome/browser/policy/configuration_policy_store_interface.h b/chrome/browser/policy/configuration_policy_store_interface.h index e697ed1..c88f07f 100644 --- a/chrome/browser/policy/configuration_policy_store_interface.h +++ b/chrome/browser/policy/configuration_policy_store_interface.h @@ -7,72 +7,14 @@ #pragma once #include "base/basictypes.h" +// configuration_policy_type.h is generated. See policy_template.json for +// policy definitions. +#include "policy/configuration_policy_type.h" class Value; namespace policy { -enum ConfigurationPolicyType { - kPolicyHomePage, - kPolicyHomepageIsNewTabPage, - kPolicyRestoreOnStartup, - kPolicyURLsToRestoreOnStartup, - kPolicyDefaultSearchProviderEnabled, - kPolicyDefaultSearchProviderName, - kPolicyDefaultSearchProviderKeyword, - kPolicyDefaultSearchProviderSearchURL, - kPolicyDefaultSearchProviderSuggestURL, - kPolicyDefaultSearchProviderIconURL, - kPolicyDefaultSearchProviderInstantURL, - kPolicyDefaultSearchProviderEncodings, - kPolicyDisableSpdy, - kPolicyProxyMode, - kPolicyProxyServerMode, - kPolicyProxyServer, - kPolicyProxyPacUrl, - kPolicyProxyBypassList, - kPolicyAlternateErrorPagesEnabled, - kPolicySearchSuggestEnabled, - kPolicyDnsPrefetchingEnabled, - kPolicySafeBrowsingEnabled, - kPolicyMetricsReportingEnabled, - kPolicyPasswordManagerEnabled, - kPolicyPasswordManagerAllowShowPasswords, - kPolicyAutoFillEnabled, - kPolicySyncDisabled, - kPolicyApplicationLocale, - kPolicyExtensionInstallAllowList, - kPolicyExtensionInstallDenyList, - kPolicyShowHomeButton, - kPolicyDisabledPlugins, - kPolicyPrintingEnabled, - kPolicyChromeFrameRendererSettings, - kPolicyRenderInChromeFrameList, - kPolicyRenderInHostList, - kPolicyJavascriptEnabled, - kPolicySavingBrowserHistoryDisabled, - kPolicyDeveloperToolsDisabled, - kPolicyBlockThirdPartyCookies, - kPolicyDefaultCookiesSetting, - kPolicyDefaultImagesSetting, - kPolicyDefaultJavaScriptSetting, - kPolicyDefaultPluginsSetting, - kPolicyDefaultPopupsSetting, - kPolicyDefaultNotificationSetting, - kPolicyDefaultGeolocationSetting, - kPolicyExtensionInstallForceList, - kPolicyChromeOsLockOnIdleSuspend, - kPolicyAuthSchemes, - kPolicyDisableAuthNegotiateCnameLookup, - kPolicyEnableAuthNegotiatePort, - kPolicyAuthServerWhitelist, - kPolicyAuthNegotiateDelegateWhitelist, - kPolicyGSSAPILibraryName, - kPolicyDisable3DAPIs, - kPolicyPolicyRefreshRate, -}; - - // Constants for the "Proxy Server Mode" defined in the policies. // Note that these diverge from internal presentation defined in // ProxyPrefs::ProxyMode for legacy reasons. The following four diff --git a/chrome/browser/policy/device_management_policy_provider_unittest.cc b/chrome/browser/policy/device_management_policy_provider_unittest.cc index 55ba883..d0a0eaa 100644 --- a/chrome/browser/policy/device_management_policy_provider_unittest.cc +++ b/chrome/browser/policy/device_management_policy_provider_unittest.cc @@ -16,9 +16,9 @@ #include "chrome/common/net/gaia/gaia_constants.h" #include "chrome/common/notification_observer_mock.h" #include "chrome/common/notification_service.h" -#include "chrome/common/policy_constants.h" #include "chrome/test/testing_device_token_fetcher.h" #include "chrome/test/testing_profile.h" +#include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/policy/file_based_policy_provider_unittest.cc b/chrome/browser/policy/file_based_policy_provider_unittest.cc index 1bb2185..2948f5f 100644 --- a/chrome/browser/policy/file_based_policy_provider_unittest.cc +++ b/chrome/browser/policy/file_based_policy_provider_unittest.cc @@ -7,7 +7,7 @@ #include "chrome/browser/policy/configuration_policy_pref_store.h" #include "chrome/browser/policy/configuration_policy_store_interface.h" #include "chrome/browser/policy/file_based_policy_provider.h" -#include "chrome/common/policy_constants.h" +#include "policy/policy_constants.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" |