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

chrome_frame/cfproxy.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_FRAME_CFPROXY_H_
 #define CHROME_FRAME_CFPROXY_H_
 #pragma once
 
 #include <windows.h>
 #include <map>  // for proxy factory
 #include <vector>
 #include <string>
 #include "base/lock.h"
 #include "base/time.h"         // for base::TimeDelta
 #include "base/file_path.h"
-#include "chrome/common/automation_constants.h"
 #include "chrome/common/page_zoom.h"
+#include "chrome/test/automation/automation_constants.h"
 
 enum FindInPageDirection { BACK = 0, FWD = 1 };
 enum FindInPageCase { IGNORE_CASE = 0, CASE_SENSITIVE = 1 };
 // Specifies the font size on a page which is requested by an automation
 // client.
 enum AutomationPageFontSize {
   SMALLEST_FONT = 8,
   SMALL_FONT = 12,
   MEDIUM_FONT = 16,
   LARGE_FONT = 24,
   LARGEST_FONT = 36
 };
 
 class URLRequestStatus;
 namespace IPC {
   struct ExternalTabSettings;
   struct NavigationInfo;
   struct AutomationURLRequest;
   struct AttachExternalTabParams;
-  struct MiniContextMenuParams;
+  struct ContextMenuParams;
 };
 
 class GURL;
 class ChromeProxyFactory;
 class ChromeProxyDelegate;
 struct ProxyParams;
 
 // Some callers of synchronous messages wants a context to be passed back
 // in order to identify the call they made. Presumably one can make
 // multiple sync calls of same type (as async) and want to identify what
@@ skipping 141 matching lines @@
   // Navigation and messaging.
   virtual void OpenURL(const GURL& url_to_open, const GURL& referrer,
                        int open_disposition) = 0;
   virtual void GoToHistoryOffset(int offset) = 0;
   virtual void MessageToHost(const std::string& message,
                              const std::string& origin,
                              const std::string& target) = 0;
   // Misc. UI.
   virtual void HandleAccelerator(const MSG& accel_message) = 0;
   virtual void HandleContextMenu(HANDLE menu_handle, int align_flags,
-                                 const IPC::MiniContextMenuParams& params) = 0;
+                                 const IPC::ContextMenuParams& params) = 0;
   virtual void TabbedOut(bool reverse) = 0;
 
   // Tab related.
   virtual void TabClosed() = 0;
   virtual void AttachTab(const IPC::AttachExternalTabParams& attach_params) = 0;
  protected:
   ~ChromeProxyDelegate() {}
 };
 
 // a way to obtain a ChromeProxy implementation
@@ skipping 11 matching lines @@
   void GetProxy(ChromeProxyDelegate* delegate, const ProxyParams& params);
   bool ReleaseProxy(ChromeProxyDelegate* delegate, const std::string& profile);
  protected:
   virtual ChromeProxy* CreateProxy();
   typedef std::map<std::string, ChromeProxy*> ProxyMap;
   ProxyMap proxies_;
   Lock lock_;
 };
 
 #endif  // CHROME_FRAME_CFPROXY_H_