summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 20:02:25 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 20:02:25 +0000
commita8ba6369d632006245574b26a2b4ee8cc21ca25f (patch)
tree60dd9ebffc2d967a8f0fd4261fefe7966719d8af /ipc
parentbee4104e372d9cbf9e3d2c15b405e96676ebc5f3 (diff)
downloadchromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.zip
chromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.tar.gz
chromium_src-a8ba6369d632006245574b26a2b4ee8cc21ca25f.tar.bz2
Part 2 of reapplying r64637.
Move the automation message files from chrome/test/automation to chrome/common/. This requires a temporary override to chrome/common/DEPS until Part 3 lands. BUG=51409 TEST=compiles Review URL: http://codereview.chromium.org/4758001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65695 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc_message_impl_macros.h2
-rw-r--r--ipc/ipc_message_macros.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/ipc/ipc_message_impl_macros.h b/ipc/ipc_message_impl_macros.h
index dfa7c91..461f2e1 100644
--- a/ipc/ipc_message_impl_macros.h
+++ b/ipc/ipc_message_impl_macros.h
@@ -22,6 +22,7 @@
// 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/gpu_messages_internal.h"
#include "chrome/common/nacl_messages_internal.h"
@@ -30,7 +31,6 @@
#include "chrome/common/service_messages_internal.h"
#include "chrome/common/utility_messages_internal.h"
#include "chrome/common/worker_messages_internal.h"
-#include "chrome/test/automation/automation_messages_internal.h"
#endif
// These are probalby still defined because of ipc_message_macros.h should be
diff --git a/ipc/ipc_message_macros.h b/ipc/ipc_message_macros.h
index 6fd789e..fad4163 100644
--- a/ipc/ipc_message_macros.h
+++ b/ipc/ipc_message_macros.h
@@ -52,10 +52,10 @@
// 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