Revert "Refactor automation messages." due to mysterious problems on mac.

chrome/test/automation/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_COMMON_AUTOMATION_MESSAGES_H__
-#define CHROME_COMMON_AUTOMATION_MESSAGES_H__
+#ifndef CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
+#define CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/common/automation_constants.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/common/page_type.h"
-#include "chrome/common/security_style.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 162 matching lines @@
      default:
       control = "UNKNOWN";
       break;
     }
 
     LogParam(control, l);
   }
 };
 
 template <>
-struct ParamTraits<PageType> {
-  typedef PageType param_type;
+struct ParamTraits<NavigationEntry::PageType> {
+  typedef NavigationEntry::PageType param_type;
   static void Write(Message* m, const param_type& p) {
     m->WriteInt(p);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     int type;
     if (!m->ReadInt(iter, &type))
       return false;
-    *p = static_cast<PageType>(type);
+    *p = static_cast<NavigationEntry::PageType>(type);
     return true;
   }
   static void Log(const param_type& p, std::string* l) {
     std::string control;
     switch (p) {
-     case NORMAL_PAGE:
+     case NavigationEntry::NORMAL_PAGE:
       control = "NORMAL_PAGE";
       break;
-     case ERROR_PAGE:
+     case NavigationEntry::ERROR_PAGE:
       control = "ERROR_PAGE";
       break;
-     case INTERSTITIAL_PAGE:
+     case NavigationEntry::INTERSTITIAL_PAGE:
       control = "INTERSTITIAL_PAGE";
       break;
      default:
       control = "UNKNOWN";
       break;
     }
 
     LogParam(control, l);
   }
 };
@@ skipping 279 matching lines @@
     LogParam(p.security_style, l);
     l->append(", ");
     LogParam(p.displayed_insecure_content, l);
     l->append(", ");
     LogParam(p.ran_insecure_content, l);
     l->append(")");
   }
 };
 
 // A stripped down version of ContextMenuParams in webkit/glue/context_menu.h.
-struct MiniContextMenuParams {
+struct ContextMenuParams {
   // The x coordinate for displaying the menu.
   int screen_x;
 
   // The y coordinate for displaying the menu.
   int screen_y;
 
   // This is the URL of the link that encloses the node the context menu was
   // invoked on.
   GURL link_url;
 
   // The link URL to be used ONLY for "copy link address". We don't validate
   // this field in the frontend process.
   GURL unfiltered_link_url;
 
   // This is the source URL for the element that the context menu was
   // invoked on.  Example of elements with source URLs are img, audio, and
   // video.
   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 MiniContextMenuParams structure to pack/unpack.
+// Traits for ContextMenuParams structure to pack/unpack.
 template <>
-struct ParamTraits<MiniContextMenuParams> {
-  typedef MiniContextMenuParams param_type;
+struct ParamTraits<ContextMenuParams> {
+  typedef ContextMenuParams 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);
     WriteParam(m, p.frame_url);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
@@ skipping 67 matching lines @@
     LogParam(p.user_gesture, l);
     l->append(",");
     LogParam(p.profile_name, l);
     l->append(")");
   }
 };
 
 }  // namespace IPC
 
 #define MESSAGES_INTERNAL_FILE \
-    "chrome/common/automation_messages_internal.h"
+    "chrome/test/automation/automation_messages_internal.h"
 #include "ipc/ipc_message_macros.h"
 
-#endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__
+#endif  // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__