4 files changed, 15 insertions, 8 deletions
diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index 79d8975..b14cb6a 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.h
@@ -9,9 +9,10 @@
 #include <vector>
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/common/ipc_message.h"
-#include "chrome/common/ipc_message_utils.h"
+#include "chrome/common/common_message_utils.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
+#include "ipc/ipc_message.h"
+#include "ipc/ipc_message_utils.h"
 #include "googleurl/src/gurl.h"
 
 // The purpose of this class is to act as a serializable version of
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index 5968f78..9b24acc 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -10,8 +10,9 @@
 #include "base/basictypes.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/security_style.h"
-#include "chrome/common/ipc_message_utils.h"
+#include "chrome/common/common_message_utils.h"
 #include "chrome/test/automation/automation_constants.h"
+#include "ipc/ipc_message_utils.h"
 
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
@@ -215,8 +216,13 @@ struct ParamTraits<Reposition_Params> {
 
 }  // namespace IPC
 
+#if 0
+// This for tools which parse #include lines, but cannot process when we
+// include via a macro name.
+#include "chrome/test/automation/automation_messages_internal.h"
+#endif
 #define MESSAGES_INTERNAL_FILE \
     "chrome/test/automation/automation_messages_internal.h"
-#include "chrome/common/ipc_message_macros.h"
+#include "ipc/ipc_message_macros.h"
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 59599b1..cc7d644 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -14,9 +14,9 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/string16.h"
-#include "chrome/common/ipc_message_macros.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
+#include "ipc/ipc_message_macros.h"
 #include "googleurl/src/gurl.h"
 
 // NOTE: All IPC messages have either a routing_id of 0 (for asynchronous
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index 138edd0..f31205d 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -13,11 +13,11 @@
 #include "base/time.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
-#include "chrome/common/ipc_channel_proxy.h"
-#include "chrome/common/ipc_message.h"
-#include "chrome/common/ipc_sync_channel.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/automation_messages.h"
+#include "ipc/ipc_channel_proxy.h"
+#include "ipc/ipc_message.h"
+#include "ipc/ipc_sync_channel.h"
 
 #if defined(OS_WIN)
 // TODO(port): Enable this or equivalent.