Simplify the magic required to create IPC message headers a bit.

ipc/sync_socket_unittest.cc

 // Copyright (c) 2009 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 <string>
 #include <sstream>
 
 #include "base/message_loop.h"
 #if defined(OS_LINUX) || defined(OS_MACOSX)
 #include "base/file_descriptor_posix.h"
 #endif  // defined(OS_LINUX) || defined(OS_MACOSX)
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/sync_socket.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_message_utils_impl.h"
 #include "ipc/ipc_tests.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/multiprocess_func_list.h"
 
 
 // We don't actually use the messages defined in this file, but we do this
 // to get to the IPC macros.
-#define MESSAGES_INTERNAL_FILE "ipc/ipc_sync_message_unittest.h"
-#include "ipc/ipc_message_macros.h"
+#include "ipc/ipc_sync_message_unittest.h"
 
 enum IPCMessageIds {
   UNUSED_IPC_TYPE,
   SERVER_FIRST_IPC_TYPE,    // SetHandle message sent to server.
   SERVER_SECOND_IPC_TYPE,   // Shutdown message sent to server.
   CLIENT_FIRST_IPC_TYPE     // Response message sent to client.
 };
 
 namespace {
 const char kHelloString[] = "Hello, SyncSocket Client";
@@ skipping 203 matching lines @@
 #endif  // defined(OS_WIN)
   EXPECT_TRUE(chan.Send(msg));
   // Use the current thread as the I/O thread.
   MessageLoop::current()->Run();
   // Shut down.
   delete pair[0];
   delete pair[1];
   EXPECT_TRUE(base::WaitForSingleProcess(server_process, 5000));
   base::CloseProcessHandle(server_process);
 }