Part 2 of reapplying r64637.

chrome/common/automation_messages.h

Index: chrome/common/automation_messages.h
diff --git a/chrome/test/automation/automation_messages.h b/chrome/common/automation_messages.h
similarity index 98%
rename from chrome/test/automation/automation_messages.h
rename to chrome/common/automation_messages.h
index afaa87f92d109106ffaa129804ed03244bb813f6..bc7770411dac7b63eb166716a4fb32c6ccca4b3a 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/common/automation_messages.h
@@ -2,21 +2,20 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
-#define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
+#ifndef CHROME_COMMON_AUTOMATION_MESSAGES_H__
+#define CHROME_COMMON_AUTOMATION_MESSAGES_H__
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "chrome/common/automation_constants.h"
+#include "chrome/common/common_param_traits.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/security_style.h"
-#include "chrome/common/common_param_traits.h"
-#include "chrome/test/automation/automation_constants.h"
 #include "gfx/rect.h"
 #include "net/base/upload_data.h"
 
-
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
   int unused;
@@ -548,7 +547,7 @@ struct MiniContextMenuParams {
   GURL frame_url;
 };
 
-// Traits for ContextMenuParams structure to pack/unpack.
+// Traits for MiniContextMenuParams structure to pack/unpack.
 template <>
 struct ParamTraits<MiniContextMenuParams> {
   typedef MiniContextMenuParams param_type;
@@ -639,7 +638,7 @@ struct ParamTraits<AttachExternalTabParams> {
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE \
-    "chrome/test/automation/automation_messages_internal.h"
+    "chrome/common/automation_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
-#endif  // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
+#endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__