Index: chrome/tools/ipclist/ipcfuzz.cc |
diff --git a/chrome/tools/ipclist/ipcfuzz.cc b/chrome/tools/ipclist/ipcfuzz.cc |
index 1d288c57f5db4cdf6a91aa6cc2bec70c3ea6d01e..764c0cffb8bd55fb2e683803a5ff574e4063ad91 100644 |
--- a/chrome/tools/ipclist/ipcfuzz.cc |
+++ b/chrome/tools/ipclist/ipcfuzz.cc |
@@ -510,13 +510,11 @@ class PickleCracker : public Pickle { |
#include "ipc/ipc_message_null_macros.h" |
// STRUCT declarations cause corresponding STRUCT_TRAITS declarations to occur. |
-#undef IPC_STRUCT_BEGIN |
#undef IPC_STRUCT_BEGIN_WITH_PARENT |
#undef IPC_STRUCT_MEMBER |
#undef IPC_STRUCT_END |
#define IPC_STRUCT_BEGIN_WITH_PARENT(struct_name, parent)\ |
- IPC_STRUCT_BEGIN(struct_name) |
-#define IPC_STRUCT_BEGIN(struct_name) IPC_STRUCT_TRAITS_BEGIN(struct_name) |
+ IPC_STRUCT_TRAITS_BEGIN(struct_name) |
#define IPC_STRUCT_MEMBER(type, name, ...) IPC_STRUCT_TRAITS_MEMBER(name) |
#define IPC_STRUCT_END() IPC_STRUCT_TRAITS_END() |
@@ -540,8 +538,8 @@ class PickleCracker : public Pickle { |
} \ |
}; |
-#undef IPC_ENUM_TRAITS |
-#define IPC_ENUM_TRAITS(enum_name) \ |
+#undef IPC_ENUM_TRAITS_VALIDATE |
+#define IPC_ENUM_TRAITS_VALIDATE(enum_name, validation_expression) \ |
template <> \ |
struct FuzzTraits<enum_name> { \ |
static void Fuzz(enum_name* p, IPC::Fuzzer* fuzzer) { \ |