Fix another source of flakiness in ErrorPageTest

chrome/test/automation/automation_messages_internal.h

 // Copyright (c) 2006-2008 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 64 matching lines @@
   // string, and the second parameter is the cookie name and value to be set.
   // The return value is a non-negative value on success.
   IPC_SYNC_MESSAGE_ROUTED3_1(AutomationMsg_SetCookie, GURL, std::string,
                              int, int)
 
   // This message notifies the AutomationProvider to navigate to a specified
   // url in the tab with given handle. The first parameter is the handle to
   // the tab resource. The second parameter is the target url.  The return
   // value contains a status code which is nonnegative on success.
   // See AutomationMsg_NavigationResponseValues for the return value.
+  //
+  // Deprecated in favor of
+  // AutomationMsg_NavigateToURLBlockUntilNavigationsComplete.
   // TODO(phajdan.jr): Remove when the reference build gets updated.
   IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_NavigateToURL, int, GURL,
                              AutomationMsg_NavigationResponseValues)
 
   // This message is used to implement the asynchronous version of
   // NavigateToURL.
   IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_NavigationAsync,
                              int /* tab handle */,
                              GURL,
                              bool /* result */)
 
   // This message notifies the AutomationProvider to navigate back in session
   // history in the tab with given handle. The first parameter is the handle
-  // to the tab resource.  The return value contains a status code which is
-  // nonnegative on success.
-  // see AutomationMsg_NavigationResponseValues for the navigation response
+  // to the tab resource.
+  // See AutomationMsg_NavigationResponseValues for the navigation response
   // values.
+  //
+  // Deprecated in favor of AutomationMsg_GoBackBlockUntilNavigationsComplete.
+  // TODO(phajdan.jr): Remove when the reference build gets updated.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_GoBack, int,
                              AutomationMsg_NavigationResponseValues)
 
   // This message notifies the AutomationProvider to navigate forward in session
   // history in the tab with given handle. The first parameter is the handle
-  // to the tab resource.  The response contains a status code which is
-  // nonnegative on success.
-  // see AutomationMsg_NavigationResponseValues for the navigation response
+  // to the tab resource.
+  // See AutomationMsg_NavigationResponseValues for the navigation response
   // values.
+  //
+  // Deprecated in favor of
+  // AutomationMsg_GoForwardBlockUntilNavigationsComplete.
+  // TODO(phajdan.jr): Remove when the reference build gets updated.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_GoForward, int,
                              AutomationMsg_NavigationResponseValues)
 
   // This message requests the number of browser windows that the app currently
   // has open.  The return value is the number of windows.
   IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_BrowserWindowCount, int)
 
   // This message requests the handle (int64 app-unique identifier) of the
   // window with the given (zero-based) index.  On error, the returned handle
   // value is 0.
@@ skipping 912 matching lines @@
   //  - bool: whether the operation was successful.
   IPC_SYNC_MESSAGE_ROUTED1_1(AutomationMsg_WaitForBrowserWindowCountToBecome,
                              int, bool)
 
   // This message requests the provider to wait until an application modal
   // dialog is shown.
   // Response:
   //  - bool: whether the operation was successful
   IPC_SYNC_MESSAGE_ROUTED0_1(AutomationMsg_WaitForAppModalDialogToBeShown, bool)
 
+  // This message notifies the AutomationProvider to navigate back in session
+  // history in the tab with given handle. The first parameter is the handle
+  // to the tab resource. The second parameter is the number of navigations the
+  // provider will wait for.
+  // See AutomationMsg_NavigationResponseValues for the navigation response
+  // values.
+  IPC_SYNC_MESSAGE_ROUTED2_1(AutomationMsg_GoBackBlockUntilNavigationsComplete,
+                             int, int,
+                             AutomationMsg_NavigationResponseValues)
+
+  // This message notifies the AutomationProvider to navigate forward in session
+  // history in the tab with given handle. The first parameter is the handle
+  // to the tab resource. The second parameter is the number of navigations
+  // the provider will wait for.
+  // See AutomationMsg_NavigationResponseValues for the navigation response
+  // values.
+  IPC_SYNC_MESSAGE_ROUTED2_1(
+      AutomationMsg_GoForwardBlockUntilNavigationsComplete, int, int,
+      AutomationMsg_NavigationResponseValues)
+
 IPC_END_MESSAGES(Automation)