Automation: fix chrome/browser dependency on chrome/test headers.

chrome/common/automation_messages_internal.h

 // Copyright (c) 2011 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.
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "chrome/common/content_settings.h"
-#include "chrome/test/automation/autocomplete_edit_proxy.h"
 #include "content/common/navigation_types.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/window_open_disposition.h"
 
-
 // NOTE: All IPC messages have either a routing_id of 0 (for asynchronous
 //       messages), or one that's been assigned by the proxy (for calls
 //       which expect a response).  The routing_id shouldn't be used for
 //       any other purpose in these message types.
 
 // NOTE: All the new IPC messages should go at the end.
 //       The IPC message IDs need to match the reference builds.  Since we now
 //       define the IDs based on __LINE__, to allow these IPC messages to be
 //       used to control an old version of Chrome we need the message IDs to
 //       remain the same.  This means that you should not change the line number
 //       of any of the messages below.  This will be fixed once Xcode supports
 //       __COUNTER__, in which case we can get rid of the __LINE__.
 
+
+
 #define IPC_MESSAGE_START AutomationMsgStart
 
 // This message is fired when the AutomationProvider is up and running
 // in the app (the app is not fully up at this point). The parameter to this
 // message is the version string of the automation provider. This parameter
 // is defined to be the version string as returned by
 // chrome::VersionInfo::Version().
 // The client can choose to use this version string to decide whether or not
 // it can talk to the provider.
 IPC_MESSAGE_CONTROL1(AutomationMsg_Hello,
@@ skipping 290 matching lines @@
                             int /* browser handle */)
 
 // This message requests the window associated with the specified browser
 // handle.
 // The return value contains a success flag and the handle of the window.
 IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_WindowForBrowser,
                             int /* browser handle */,
                             bool /* success flag */,
                             int /* window handle */)
 
-// This message requests the AutocompleteEdit associated with the specified
-// browser handle.
-// The return value contains a success flag and the handle of the omnibox.
-IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_AutocompleteEditForBrowser,
+// TODO(phajdan.jr): Remove when the reference build is updated (this and
+// all others marked "DEPRECATED MESSAGE").
+// (intentionally blank line)
+IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_DEPRECATED_AutocompleteEditForBrowser,
                             int /* browser handle */,
                             bool /* success flag */,
                             int /* AutocompleteEdit handle */)
 
 // This message requests that a mouse click be performed in window coordinate
 // space.
 // Request:
 //   int - the handle of the window that's the context for this click
 //   gfx::Point - the point to click
 //   int - the flags which identify the mouse button(s) for the click, as
@@ skipping 282 matching lines @@
 // for saving resources. The fourth parameter is the saving type: 0 for HTML
 // only; 1 for complete web page.
 // The return value contains a bool which is true on success.
 IPC_SYNC_MESSAGE_CONTROL4_1(AutomationMsg_SavePage,
                             int,
                             FilePath,
                             FilePath,
                             int,
                             bool)
 
-// This message requests the text currently being displayed in the
-// AutocompleteEdit.  The parameter is the handle to the AutocompleteEdit.
-// The return value is a string indicating the text in the AutocompleteEdit.
-IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_AutocompleteEditGetText,
+// TODO(phajdan.jr): Remove when the reference build is updated (this and
+// all others marked "DEPRECATED MESSAGE").
+// (intentionally blank line)
+IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_DEPRECATED_AutocompleteEditGetText,
                             int /* autocomplete edit handle */,
                             bool /* the requested autocomplete edit exists */,
                             string16 /* omnibox text */)
 
-// This message sets the text being displayed in the AutocompleteEdit.  The
-// first parameter is the handle to the omnibox and the second parameter is
-// the text to be displayed in the AutocompleteEdit.
-// The return value has no parameters and is returned when the operation has
-// completed.
-IPC_SYNC_MESSAGE_CONTROL2_1(AutomationMsg_AutocompleteEditSetText,
+// TODO(phajdan.jr): Remove when the reference build is updated (this and
+// all others marked "DEPRECATED MESSAGE").
+// (intentionally blank line)
+// (intentionally blank line)
+// (intentionally blank line)
+IPC_SYNC_MESSAGE_CONTROL2_1(AutomationMsg_DEPRECATED_AutocompleteEditSetText,
                             int /* autocomplete edit handle */,
                             string16 /* text to set */,
                             bool /* the requested autocomplete edit exists */)
 
-// This message requests if a query to a autocomplete provider is still in
-// progress.  The first parameter in the request is the handle to the
-// autocomplete edit.
-// The first return value indicates if the request succeeded.
-// The second return value indicates if a query is still in progress.
+// TODO(phajdan.jr): Remove when the reference build is updated (this and
+// all others marked "DEPRECATED MESSAGE").
+// (intentionally blank line)
+// (intentionally blank line)
+// (intentionally blank line)
 IPC_SYNC_MESSAGE_CONTROL1_2( \
-    AutomationMsg_AutocompleteEditIsQueryInProgress,
+    AutomationMsg_DEPRECATED_AutocompleteEditIsQueryInProgress,
     int /* autocomplete edit handle*/,
     bool /* the requested autocomplete edit exists */,
     bool /* indicates if a query is in progress */)
 
-// This message requests a list of the autocomplete messages currently being
-// displayed by the popup.  The parameter in the request is a handle to the
-// autocomplete edit.
-// The first return value indicates if the request was successful, while
-// while the second is the actual list of matches.
-IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_AutocompleteEditGetMatches,
+// TODO(phajdan.jr): Remove when the reference build is updated (this and
+// all others marked "DEPRECATED MESSAGE").
+// (intentionally blank line)
+// (intentionally blank line)
+// (intentionally blank line)
+IPC_SYNC_MESSAGE_CONTROL1_2(AutomationMsg_DEPRECATED_AutocompleteEditGetMatches,
                             int /* autocomplete edit handle*/,
                             bool /* the requested autocomplete edit exists */,
-                            std::vector<AutocompleteMatchData> /* matches */)
+                            std::vector<int> /* matches */)
 
 // This message requests the execution of a browser command in the browser
 // for which the handle is specified.
 // The return value contains a boolean, whether the command was dispatched.
 IPC_SYNC_MESSAGE_CONTROL2_1(AutomationMsg_WindowExecuteCommandAsync,
                             int /* automation handle */,
                             int /* browser command */,
                             bool /* success flag */)
 
 // This message requests the execution of a browser command in the browser
@@ skipping 59 matching lines @@
                             int /* tab_handle */,
                             size_t /* info bar count */)
 
 // This message triggers the action associated with the "accept" button in
 // the info-bar at the specified index.  If |wait for navigation| is true, it
 // won't return until a navigation has occurred.
 IPC_SYNC_MESSAGE_CONTROL3_1(AutomationMsg_ClickInfoBarAccept,
                             int /* tab_handle */,
                             size_t /* info bar index */,
                             bool /* wait for navigation */,
-// This line blank on purpose, see comment atop file about __LINE__.
+// (intentionally blank line), see comment atop file about __LINE__.
                             /* navigation result */
                             AutomationMsg_NavigationResponseValues)
 
 // This message retrieves the last time a navigation occurred in the specified
 // tab.  The value is intended to be used with WaitForNavigation.
 IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_GetLastNavigationTime,
                             int /* tab_handle */,
                             int64 /* last navigation time */)
 
 // This messages is used to block until a new navigation occurs (if there is
 // none more recent then the time specified).
 IPC_SYNC_MESSAGE_CONTROL2_1(AutomationMsg_WaitForNavigation,
                             int /* tab_handle */,
                             int64 /* last navigation time */,
-// This line blank on purpose, see comment atop file about __LINE__.
+// (intentionally blank line), see comment atop file about __LINE__.
                             /* navigation result */
                             AutomationMsg_NavigationResponseValues)
 
 // This messages sets an int-value preference.
 IPC_SYNC_MESSAGE_CONTROL3_1(AutomationMsg_SetIntPreference,
                             int /* browser handle */,
                             std::string /* pref name */,
                             int /* value */,
                             bool /* success */)
 
@@ skipping 617 matching lines @@
                             int /* browser handle */,
                             int /* target tab count */,
                             bool /* success */)
 
 // Waits for the infobar count to reach given number.
 IPC_SYNC_MESSAGE_CONTROL2_1(AutomationMsg_WaitForInfoBarCount,
                             int /* tab handle */,
                             size_t /* target count */,
                             bool /* success */)
 
-// Waits for the autocomplete edit to receive focus.
-IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_WaitForAutocompleteEditFocus,
+// TODO(phajdan.jr): Remove this message.
+IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_DEPRECATED_WaitForAutocompleteEditFocus,
                             int /* autocomplete edit handle */,
                             bool /* success */)
 
 // Loads all blocked plug-ins on the page.
 IPC_SYNC_MESSAGE_CONTROL1_1(AutomationMsg_LoadBlockedPlugins,
                             int /* tab handle */,
                             bool /* success */)
 
 // TODO(phajdan.jr): Remove this message.
 // Captures the entire page for the tab, including those portions not in
@@ skipping 54 matching lines @@
 // Sent when the renderer has completed or canceled a client redirect for a
 // particular frame. This message may be sent multiple times for the same
 // redirect.
 IPC_MESSAGE_ROUTED1(AutomationMsg_DidCompleteOrCancelClientRedirect,
                     int64 /* frame_id */)
 
 
 // YOUR NEW MESSAGE MIGHT NOT BELONG HERE.
 // This is the section for renderer -> browser automation messages. If it is
 // an automation <-> browser message, put it above this section.