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 253974eeb7fcbc4f493a41cbc84358387b378ea9..210a70c3b755a1fe0487a8541f743a1e3d215632 100644 |
--- a/chrome/utility/chrome_content_utility_ipc_whitelist.cc |
+++ b/chrome/utility/chrome_content_utility_ipc_whitelist.cc |
@@ -4,22 +4,24 @@ |
#include "chrome/utility/chrome_content_utility_ipc_whitelist.h" |
+#include "base/macros.h" |
+#include "build/build_config.h" |
+ |
#if defined(ENABLE_EXTENSIONS) |
#include "chrome/common/extensions/chrome_utility_extensions_messages.h" |
#endif |
#if defined(ENABLE_EXTENSIONS) |
-const uint32 kMessageWhitelist[] = { |
+const uint32_t kMessageWhitelist[] = { |
#if defined(OS_WIN) |
ChromeUtilityHostMsg_GetWiFiCredentials::ID, |
#endif // defined(OS_WIN) |
ChromeUtilityMsg_ImageWriter_Cancel::ID, |
ChromeUtilityMsg_ImageWriter_Write::ID, |
- ChromeUtilityMsg_ImageWriter_Verify::ID |
-}; |
+ ChromeUtilityMsg_ImageWriter_Verify::ID}; |
const size_t kMessageWhitelistSize = arraysize(kMessageWhitelist); |
#else |
// Note: Zero-size arrays are not valid C++. |
-const uint32 kMessageWhitelist[] = { 0 }; |
+const uint32_t kMessageWhitelist[] = {0}; |
const size_t kMessageWhitelistSize = 0; |
#endif // defined(ENABLE_EXTENSIONS) |