Revert my change to get the tree green. Not sure why the tests became flaky....

chrome/common/ipc_fuzzing_tests.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <iostream>
 #include <string>
 #include <sstream>
 
 #include "base/message_loop.h"
@@ skipping 78 matching lines @@
   IPC::Message m(0, 1, IPC::Message::PRIORITY_NORMAL);
   EXPECT_TRUE(m.WriteInt(0x71000000));   // This is the count of elements.
   EXPECT_TRUE(m.WriteInt64(1));
   EXPECT_TRUE(m.WriteInt64(2));
 
   std::vector<int64> vec;
   void* iter = 0;
   EXPECT_FALSE(ReadParam(&m, &iter, &vec));
 }
 
-// We don't actually use the messages defined in this fiel, but we do this
-// to get to the IPC macros.
-#define MESSAGES_INTERNAL_FILE "chrome/common/ipc_sync_message_unittest.h"
+// Typically the ipc_message_macros files is included twice but here we only
+// include it once in 'enum mode' because we want more control of the class
+// definitions.
+#define IPC_MESSAGE_MACROS_ENUMS
 #include "chrome/common/ipc_message_macros.h"
 
 enum IPCMessageIds {
   UNUSED_IPC_TYPE,
   SERVER_FIRST_IPC_TYPE,    // 1st Test message tag.
   SERVER_SECOND_IPC_TYPE,   // 2nd Test message tag.
   SERVER_THIRD_IPC_TYPE,    // 3rd Test message tag.
   CLIENT_MALFORMED_IPC,     // Sent to client if server detects bad message.
   CLIENT_UNHANDLED_IPC      // Sent to client if server detects unhanded IPC.
 };
@@ skipping 307 matching lines @@
                          IPC::Message::PRIORITY_NORMAL);
   msg->WriteInt(0x64);
   msg->WriteInt(0x32);
   EXPECT_FALSE(server.OnMessageReceived(*msg));
   delete msg;
 
   EXPECT_EQ(0, server.unhandled_msgs());
 #endif
 }