Revert r46909: "Reland r46681: Use IPC to wait for download in DownloadTest."

TBR=bauerb
TEST=ui_tests on 10.6 and ChromiumOS should go green.
BUG=43066

Review URL: http://codereview.chromium.org/1985014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46915 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 11 deletions

diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index bf53b36..5662835 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -79,21 +79,22 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
   // complete, the completed_response object is sent; if the server requires
   // authentication, we instead send the auth_needed_response object.  A pointer
   // to the added navigation observer is returned. This object should NOT be
-  // deleted and should be released by calling the RemoveObserver method.
+  // deleted and should be released by calling the corresponding
+  // RemoveNavigationStatusListener method.
   NotificationObserver* AddNavigationStatusListener(
       NavigationController* tab, IPC::Message* reply_message,
       int number_of_navigations, bool include_current_navigation);
 
+  void RemoveNavigationStatusListener(NotificationObserver* obs);
+
   // Add an observer for the TabStrip. Currently only Tab append is observed. A
   // navigation listener is created on successful notification of tab append. A
   // pointer to the added navigation observer is returned. This object should
-  // NOT be deleted and should be released by calling the RemoveObserver method.
+  // NOT be deleted and should be released by calling the corresponding
+  // RemoveTabStripObserver method.
   NotificationObserver* AddTabStripObserver(Browser* parent,
                                             IPC::Message* reply_message);
-
-  // Remove an observer. The |NotificationObserver| still needs to be deleted
-  // afterwards.
-  void RemoveObserver(NotificationObserver* obs);
+  void RemoveTabStripObserver(NotificationObserver* obs);
 
   // Get the index of a particular NavigationController object
   // in the given parent window.  This method uses
@@ -333,11 +334,6 @@ class AutomationProvider : public base::RefCounted<AutomationProvider>,
                       int64 id,
                       bool* success);
 
-  // Wait for the download shelf to appear or disappear.
-  void WaitForDownloadShelfVisibilityChange(int browser_handle,
-                                            bool visibility,
-                                            IPC::Message* reply_message);
-
   // Get info about downloads. This includes only ones that have been
   // registered by the history system.
   // Uses the JSON interface for input/output.