GTTF: Continue moving testing automation bits to TestingAutomationProvider

chrome/browser/automation/testing_automation_provider.h

Index: chrome/browser/automation/testing_automation_provider.h
diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h
index 1da6e8095f528bd6b6a1684aa9a618a49a8fd7bc..55588e955a747ffe9fec355fc94697d0a01ad9e1 100644
--- a/chrome/browser/automation/testing_automation_provider.h
+++ b/chrome/browser/automation/testing_automation_provider.h
@@ -9,6 +9,7 @@
 #include "base/basictypes.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/history/history.h"
 #include "chrome/common/notification_registrar.h"
 
 // This is an automation provider containing testing calls.
@@ -52,6 +53,30 @@ class TestingAutomationProvider : public AutomationProvider,
   void NavigateToURLBlockUntilNavigationsComplete(int handle, const GURL& url,
                                                   int number_of_navigations,
                                                   IPC::Message* reply_message);
+  void NavigationAsync(int handle, const GURL& url, bool* status);
+  void NavigationAsyncWithDisposition(int handle,
+                                      const GURL& url,
+                                      WindowOpenDisposition disposition,
+                                      bool* status);
+  void GoBack(int handle, IPC::Message* reply_message);
+  void GoForward(int handle, IPC::Message* reply_message);
+  void Reload(int handle, IPC::Message* reply_message);
+  void SetAuth(int tab_handle, const std::wstring& username,
+               const std::wstring& password, IPC::Message* reply_message);
+  void CancelAuth(int tab_handle, IPC::Message* reply_message);
+  void NeedsAuth(int tab_handle, bool* needs_auth);
+  void GetRedirectsFrom(int tab_handle,
+                        const GURL& source_url,
+                        IPC::Message* reply_message);
+  void GetBrowserWindowCount(int* window_count);
+  void GetNormalBrowserWindowCount(int* window_count);
+
+  // Callback for history redirect queries.
+  virtual void OnRedirectQueryComplete(
+      HistoryService::Handle request_handle,
+      GURL from_url,
+      bool success,
+      history::RedirectList* redirects);
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
@@ -59,6 +84,12 @@ class TestingAutomationProvider : public AutomationProvider,
 
   void OnRemoveProvider();  // Called via PostTask
 
+  // Handle for an in-process redirect query. We expect only one redirect query
+  // at a time (we should have only one caller, and it will block while waiting
+  // for the results) so there is only one handle. When non-0, indicates a
+  // query in progress.
+  HistoryService::Handle redirect_query_;
+
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingAutomationProvider);