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

chrome/test/automation/automation_messages_internal.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.
 
 // Defines the IPC messages used by the automation interface.
 
 // This header is meant to be included in multiple passes, hence no traditional
 // header guard.
 // See ipc_message_macros.h for explanation of the macros and passes.
 
@@ skipping 593 matching lines @@
                              SecurityStyle,
                              int,
                              int)
 
   // This message requests the page type of the page displayed in the specified
   // tab (normal, error or interstitial).
   // Request:
   //   - int: handle of the tab
   // Response:
   //  - bool: whether the operation was successful.
-  //  - PageType: the type of the page currently displayed.
-  IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_GetPageType, int, bool, PageType)
+  //  - NavigationEntry::PageType: the type of the page currently displayed.
+  IPC_SYNC_MESSAGE_ROUTED1_2(AutomationMsg_GetPageType, int, bool,
+                             NavigationEntry::PageType)
 
   // This message simulates the user action on the SSL blocking page showing in
   // the specified tab.  This message is only effective if an interstitial page
   // is showing in the tab.
   // Request:
   //   - int: handle of the tab
   //   - bool: whether to proceed or abort the navigation
   // Response:
   //  - AutomationMsg_NavigationResponseValues: result of the operation.
   IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_ActionOnSSLBlockingPage, int, bool,
@@ skipping 318 matching lines @@
   // |chrome_locale| will contain the locale as reported by ICU.  On failure
   // |chrome_locale| is the empty string.
   IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_GetBrowserLocale,
                              string16 /* chrome_locale */)
 
 #if defined(OS_WIN)
   IPC_MESSAGE_ROUTED4(AutomationMsg_ForwardContextMenuToExternalHost,
                       int /* tab_handle */,
                       HANDLE /* source menu handle */,
                       int    /* align flags */,
-                      IPC::MiniContextMenuParams /* params */)
+                      IPC::ContextMenuParams /* params */)
 
   IPC_MESSAGE_ROUTED2(AutomationMsg_ForwardContextMenuCommandToChrome,
                       int /* tab_handle */,
                       int /* selected_command */)
 #endif  // OS_WIN
 
   // A URL request to be fetched via automation
   IPC_MESSAGE_ROUTED3(AutomationMsg_RequestStart,
                       int /* tab_handle */,
                       int /* request_id */,
@@ skipping 474 matching lines @@
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_WaitForAutocompleteEditFocus,
                              int /* autocomplete edit handle */,
                              bool /* success */)
 
   // Loads all blocked plug-ins on the page.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_LoadBlockedPlugins,
                              int /* tab handle */,
                              bool /* success */)
 
 IPC_END_MESSAGES(Automation)