Make ARRAYSIZE_UNSAFE() just use arraysize().

chrome/utility/chrome_content_utility_ipc_whitelist.cc

Index: chrome/utility/chrome_content_utility_ipc_whitelist.cc
diff --git a/chrome/utility/chrome_content_utility_ipc_whitelist.cc b/chrome/utility/chrome_content_utility_ipc_whitelist.cc
index 7e2376a1ce055b3a62e15f41fbd38b83495fd487..253974eeb7fcbc4f493a41cbc84358387b378ea9 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;

[Tom Sepez, 2014/10/13 23:07:12]

Alternatively, It looks like this is used only in one place in
chrome_content_utility_client, right after a ENABLE_EXTENSIONS ifdef, as it
turns out.  Maybe that usage gets guarded as well, and this just doesn't exist
unless ENABLE_EXTENSIONS.

+#endif  // defined(ENABLE_EXTENSIONS)