diff options
| author | mostynb <mostynb@opera.com> | 2014-12-22 13:14:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-22 21:15:32 +0000 |
| commit | 470748ce474f8fce7a566eb570021273c88d04c0 (patch) | |
| tree | 6955cf4690aa6dc87f4f84d99fcb0a665d2de5aa /components/content_settings | |
| parent | d054c43b09a963b2c138b8f7f4cb2c26a2056eb3 (diff) | |
| download | chromium_src-470748ce474f8fce7a566eb570021273c88d04c0.zip chromium_src-470748ce474f8fce7a566eb570021273c88d04c0.tar.gz chromium_src-470748ce474f8fce7a566eb570021273c88d04c0.tar.bz2 | |
replace COMPILE_ASSERT with static_assert in components/
BUG=442514
Review URL: https://codereview.chromium.org/794683005
Cr-Commit-Position: refs/heads/master@{#309464}
Diffstat (limited to 'components/content_settings')
4 files changed, 10 insertions, 8 deletions
diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc index 90b91a3..53e9f8d 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc @@ -55,8 +55,9 @@ const ContentSetting kDefaultSettings[] = { CONTENT_SETTING_DEFAULT, // CONTENT_SETTINGS_TYPE_APP_BANNER #endif }; -COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, - default_settings_incorrect_size); +static_assert(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES, + "kDefaultSettings should have CONTENT_SETTINGS_NUM_TYPES " + "elements"); } // namespace diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc index e2976070..638b29d 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -50,8 +50,9 @@ const char* kPrefToManageType[] = { NULL, // No policy for default value of app banners #endif }; -COMPILE_ASSERT(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, - managed_content_settings_pref_names_array_size_incorrect); +static_assert(arraysize(kPrefToManageType) == CONTENT_SETTINGS_NUM_TYPES, + "kPrefToManageType should have CONTENT_SETTINGS_NUM_TYPES " + "elements"); struct PrefsForManagedContentSettingsMapEntry { const char* pref_name; diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc index ed34406..66c5353 100644 --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc @@ -51,8 +51,8 @@ const char* kTypeNames[] = { "app-banner", #endif }; -COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, - type_names_incorrect_size); +static_assert(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES, + "kTypeNames should have CONTENT_SETTINGS_NUM_TYPES elements"); const char kPatternSeparator[] = ","; diff --git a/components/content_settings/core/browser/host_content_settings_map.cc b/components/content_settings/core/browser/host_content_settings_map.cc index 5571ac6..b229a8b 100644 --- a/components/content_settings/core/browser/host_content_settings_map.cc +++ b/components/content_settings/core/browser/host_content_settings_map.cc @@ -62,9 +62,9 @@ content_settings::SettingSource kProviderSourceMap[] = { content_settings::SETTING_SOURCE_USER, content_settings::SETTING_SOURCE_USER, }; -COMPILE_ASSERT(arraysize(kProviderSourceMap) == +static_assert(arraysize(kProviderSourceMap) == HostContentSettingsMap::NUM_PROVIDER_TYPES, - kProviderSourceMap_has_incorrect_size); + "kProviderSourceMap should have NUM_PROVIDER_TYPES elements"); // Returns true if the |content_type| supports a resource identifier. // Resource identifiers are supported (but not required) for plug-ins. |