summaryrefslogtreecommitdiffstats
path: root/chrome/utility
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/utility')
-rw-r--r--chrome/utility/chrome_content_utility_ipc_whitelist.cc11
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/utility/chrome_content_utility_ipc_whitelist.cc b/chrome/utility/chrome_content_utility_ipc_whitelist.cc
index 7e2376a..253974e 100644
--- a/chrome/utility/chrome_content_utility_ipc_whitelist.cc
+++ b/chrome/utility/chrome_content_utility_ipc_whitelist.cc
@@ -8,15 +8,18 @@
#include "chrome/common/extensions/chrome_utility_extensions_messages.h"
#endif
-const uint32 kMessageWhitelist[] = {
#if defined(ENABLE_EXTENSIONS)
+const uint32 kMessageWhitelist[] = {
#if defined(OS_WIN)
ChromeUtilityHostMsg_GetWiFiCredentials::ID,
#endif // defined(OS_WIN)
ChromeUtilityMsg_ImageWriter_Cancel::ID,
ChromeUtilityMsg_ImageWriter_Write::ID,
ChromeUtilityMsg_ImageWriter_Verify::ID
-#endif // defined(ENABLE_EXTENSIONS)
};
-
-const size_t kMessageWhitelistSize = ARRAYSIZE_UNSAFE(kMessageWhitelist);
+const size_t kMessageWhitelistSize = arraysize(kMessageWhitelist);
+#else
+// Note: Zero-size arrays are not valid C++.
+const uint32 kMessageWhitelist[] = { 0 };
+const size_t kMessageWhitelistSize = 0;
+#endif // defined(ENABLE_EXTENSIONS)