Part 2 of reapplying r64637.

chrome/common/automation_messages.h

 // Copyright (c) 2010 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.
 
-#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;
 
   // The word(s) to find on the page.
   string16 search_string;
 
   // Whether to search forward or backward within the page.
   bool forward;
 
@@ skipping 511 matching lines @@
   GURL src_url;
 
   // This is the URL of the top level page that the context menu was invoked
   // on.
   GURL page_url;
 
   // This is the URL of the subframe that the context menu was invoked on.
   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;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.screen_x);
     WriteParam(m, p.screen_y);
     WriteParam(m, p.link_url);
     WriteParam(m, p.unfiltered_link_url);
     WriteParam(m, p.src_url);
     WriteParam(m, p.page_url);
@@ skipping 70 matching lines @@
     LogParam(p.user_gesture, l);
     l->append(",");
     LogParam(p.profile_name, l);
     l->append(")");
   }
 };
 
 }  // 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__