Index: chrome/browser/extensions/api/content_settings/content_settings_helpers.cc |
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc |
index 6601abdb2debdd836562cd853adaa5115786ef58..7fc2e85b19240e12a35932715258d17e036cefde 100644 |
--- a/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc |
+++ b/chrome/browser/extensions/api/content_settings/content_settings_helpers.cc |
@@ -26,9 +26,9 @@ const char* const kContentSettingsTypeNames[] = { |
"location", |
"notifications", |
}; |
-COMPILE_ASSERT(arraysize(kContentSettingsTypeNames) <= |
- CONTENT_SETTINGS_NUM_TYPES, |
- content_settings_type_names_size_invalid); |
+static_assert(arraysize(kContentSettingsTypeNames) <= |
+ CONTENT_SETTINGS_NUM_TYPES, |
+ "kContentSettingsTypeNames has an unexpected number of elements"); |
const char* const kContentSettingNames[] = { |
"default", |
@@ -37,9 +37,9 @@ const char* const kContentSettingNames[] = { |
"ask", |
"session_only", |
}; |
-COMPILE_ASSERT(arraysize(kContentSettingNames) <= |
- CONTENT_SETTING_NUM_SETTINGS, |
- content_setting_names_size_invalid); |
+static_assert(arraysize(kContentSettingNames) <= |
+ CONTENT_SETTING_NUM_SETTINGS, |
+ "kContentSettingNames has an unexpected number of elements"); |
// TODO(bauerb): Move this someplace where it can be reused. |
std::string GetDefaultPort(const std::string& scheme) { |