Part 2 of reapplying r64637.

ipc/ipc_message_macros.h

 // 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.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 //
 // In the first pass, IPC_MESSAGE_MACROS_ENUMS should be defined, which will
 // create enums for each of the messages defined with the IPC_MESSAGE_* macros.
 //
@@ skipping 34 matching lines @@
 
 #ifndef MESSAGES_INTERNAL_FILE
 #error This file should only be included by X_messages.h, which needs to define\
        MESSAGES_INTERNAL_FILE first.
 #endif
 
 // Trick scons and xcode into seeing the possible real dependencies since they
 // don't understand #include MESSAGES_INTERNAL_FILE. See http://crbug.com/7828
 #if 0
 #include "ipc/ipc_sync_message_unittest.h"
+#include "chrome/common/automation_messages_internal.h"
+#include "chrome/common/devtools_messages_internal.h"
 #include "chrome/common/plugin_messages_internal.h"
 #include "chrome/common/render_messages_internal.h"
-#include "chrome/common/devtools_messages_internal.h"
-#include "chrome/test/automation/automation_messages_internal.h"
 #include "chrome/common/worker_messages_internal.h"
 #endif
 
 #ifndef IPC_MESSAGE_MACROS_INCLUDE_BLOCK
 #define IPC_MESSAGE_MACROS_INCLUDE_BLOCK
 
 // Multi-pass include of X_messages_internal.h.  Preprocessor magic allows
 // us to use 1 header to define the enums and classes for our render messages.
 #define IPC_MESSAGE_MACROS_ENUMS
 #include MESSAGES_INTERNAL_FILE
@@ skipping 1253 matching lines @@
       public IPC::MessageWithReply<Tuple5<type1_in, type2_in, type3_in, type4_in, type5_in>, \
           Tuple3<type1_out&, type2_out&, type3_out&> > { \
    public: \
    enum { ID = msg_class##__ID }; \
    msg_class(int routing_id, const type1_in& arg1, const type2_in& arg2, const type3_in& arg3, const type4_in& arg4, const type4_in& arg5, type1_out* arg6, type2_out* arg7, type3_out* arg8); \
       ~msg_class();                                                     \
       static void Log(const Message* msg, std::string* l);              \
   };
 
 #endif  // #if defined()