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

chrome/browser/importer/firefox_importer_unittest_utils_mac.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 "chrome/browser/importer/firefox_importer_unittest_utils.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug_on_start.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/test/test_timeouts.h"
 #include "chrome/browser/importer/firefox_importer_utils.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_descriptors.h"
 #include "ipc/ipc_message.h"
-#include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_switches.h"
 #include "testing/multiprocess_func_list.h"
 
-// Declaration of IPC Messages used for this test.
-#define MESSAGES_INTERNAL_FILE \
-    "chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
-#include "ipc/ipc_message_macros.h"
-
-// Definition of IPC Messages used for this test.
-#define MESSAGES_INTERNAL_IMPL_FILE \
-  "chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
-#include "ipc/ipc_message_impl_macros.h"
+#define IPC_MESSAGE_IMPL
+#include "chrome/browser/importer/firefox_importer_unittest_messages_internal.h"
 
 namespace {
 
 // Name of IPC Channel to use for Server<-> Child Communications.
 const char kTestChannelID[] = "T1";
 
 // Launch the child process:
 // |nss_path| - path to the NSS directory holding the decryption libraries.
 // |channel| - IPC Channel to use for communication.
 // |handle| - On return, the process handle to use to communicate with the
@@ skipping 223 matching lines @@
 
   IPC::Channel channel(kTestChannelID, IPC::Channel::MODE_CLIENT, &listener);
   CHECK(channel.Connect());
   listener.SetSender(&channel);
 
   // run message loop
   MessageLoop::current()->Run();
 
   return 0;
 }