Fix another source of flakiness in ErrorPageTest

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 1146 matching lines @@
     IPC_MESSAGE_HANDLER(AutomationMsg_Copy, Copy)
     IPC_MESSAGE_HANDLER(AutomationMsg_Paste, Paste)
     IPC_MESSAGE_HANDLER(AutomationMsg_ReloadAsync, ReloadAsync)
     IPC_MESSAGE_HANDLER(AutomationMsg_StopAsync, StopAsync)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_WaitForBrowserWindowCountToBecome,
         WaitForBrowserWindowCountToBecome)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(
         AutomationMsg_WaitForAppModalDialogToBeShown,
         WaitForAppModalDialogToBeShown)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(
+        AutomationMsg_GoBackBlockUntilNavigationsComplete,
+        GoBackBlockUntilNavigationsComplete)
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(
+        AutomationMsg_GoForwardBlockUntilNavigationsComplete,
+        GoForwardBlockUntilNavigationsComplete)
   IPC_END_MESSAGE_MAP()
 }
 
 void AutomationProvider::ActivateTab(int handle, int at_index, int* status) {
   *status = -1;
   if (browser_tracker_->ContainsHandle(handle) && at_index > -1) {
     Browser* browser = browser_tracker_->GetResource(handle);
     if (at_index >= 0 && at_index < browser->tab_count()) {
       browser->SelectTabContentsAt(at_index, true);
       *status = 0;
@@ skipping 1544 matching lines @@
     AutomationMsg_WaitForAppModalDialogToBeShown::WriteReplyParams(
         reply_message, true);
     Send(reply_message);
     return;
   }
 
   // Set up an observer (it will delete itself).
   new AppModalDialogShownObserver(this, reply_message);
 }
 
+void AutomationProvider::GoBackBlockUntilNavigationsComplete(
+    int handle, int number_of_navigations, IPC::Message* reply_message) {
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    Browser* browser = FindAndActivateTab(tab);
+    if (browser && browser->command_updater()->IsCommandEnabled(IDC_BACK)) {
+      AddNavigationStatusListener(tab, reply_message, number_of_navigations);
+      browser->GoBack(CURRENT_TAB);
+      return;
+    }
+  }
+
+  AutomationMsg_GoBackBlockUntilNavigationsComplete::WriteReplyParams(
+      reply_message, AUTOMATION_MSG_NAVIGATION_ERROR);
+  Send(reply_message);
+}
+
+void AutomationProvider::GoForwardBlockUntilNavigationsComplete(
+    int handle, int number_of_navigations, IPC::Message* reply_message) {
+  if (tab_tracker_->ContainsHandle(handle)) {
+    NavigationController* tab = tab_tracker_->GetResource(handle);
+    Browser* browser = FindAndActivateTab(tab);
+    if (browser && browser->command_updater()->IsCommandEnabled(IDC_FORWARD)) {
+      AddNavigationStatusListener(tab, reply_message, number_of_navigations);
+      browser->GoForward(CURRENT_TAB);
+      return;
+    }
+  }
+
+  AutomationMsg_GoForwardBlockUntilNavigationsComplete::WriteReplyParams(
+      reply_message, AUTOMATION_MSG_NAVIGATION_ERROR);
+  Send(reply_message);
+}
+
 RenderViewHost* AutomationProvider::GetViewForTab(int tab_handle) {
   if (tab_tracker_->ContainsHandle(tab_handle)) {
     NavigationController* tab = tab_tracker_->GetResource(tab_handle);
     if (!tab) {
       NOTREACHED();
       return NULL;
     }
 
     TabContents* tab_contents = tab->tab_contents();
     if (!tab_contents) {
       NOTREACHED();
       return NULL;
     }
 
     RenderViewHost* view_host = tab_contents->render_view_host();
     return view_host;
   }
 
   return NULL;
 }