5 files changed, 10 insertions, 9 deletions
diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index 79d8975..b0594d8 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.h
@@ -9,10 +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/test/automation/automation_handle_tracker.h"
 #include "googleurl/src/gurl.h"
+#include "ipc/ipc_message.h"
+#include "ipc/ipc_message_utils.h"
 
 // The purpose of this class is to act as a serializable version of
 // AutocompleteMatch. The reason for this class is because we don't want to
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index dd17017..710b170 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -11,8 +11,9 @@
 #include "base/gfx/rect.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_param_traits.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.
@@ -341,6 +342,6 @@ struct ParamTraits<ExternalTabSettings> {
 
 #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 15528c2..b899139 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -14,10 +14,10 @@
 #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 "googleurl/src/gurl.h"
+#include "ipc/ipc_message_macros.h"
 
 // NOTE: All IPC messages have either a routing_id of 0 (for asynchronous
 //       messages), or one that's been assigned by the proxy (for calls
diff --git a/chrome/test/automation/automation_proxy.cc b/chrome/test/automation/automation_proxy.cc
index a1df2d8..dc94c18 100644
--- a/chrome/test/automation/automation_proxy.cc
+++ b/chrome/test/automation/automation_proxy.cc
@@ -13,12 +13,12 @@
 #include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/waitable_event.h"
-#include "chrome/common/chrome_descriptors.h"
 #include "chrome/test/automation/automation_constants.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
+#include "ipc/ipc_descriptors.h"
 #if defined(OS_WIN)
 // TODO(port): Enable when dialog_delegate is ported.
 #include "views/window/dialog_delegate.h"
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index ffbf39d..186d7bf 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -14,11 +14,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"
 
 class BrowserProxy;
 class TabProxy;