Use IPC to wait for download in DownloadTest.

chrome/browser/automation/automation_provider.cc

 // Copyright (c) 2010 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 198 matching lines @@
     int number_of_navigations, bool include_current_navigation) {
   NotificationObserver* observer =
       new NavigationNotificationObserver(tab, this, reply_message,
                                          number_of_navigations,
                                          include_current_navigation);
 
   notification_observer_list_.AddObserver(observer);
   return observer;
 }
 
-void AutomationProvider::RemoveNavigationStatusListener(
-    NotificationObserver* obs) {
-  notification_observer_list_.RemoveObserver(obs);
-}
-
 NotificationObserver* AutomationProvider::AddTabStripObserver(
     Browser* parent,
     IPC::Message* reply_message) {
   NotificationObserver* observer =
       new TabAppendedNotificationObserver(parent, this, reply_message);
   notification_observer_list_.AddObserver(observer);
 
   return observer;
 }
 
-void AutomationProvider::RemoveTabStripObserver(NotificationObserver* obs) {
+void AutomationProvider::RemoveObserver(NotificationObserver* obs) {
   notification_observer_list_.RemoveObserver(obs);
 }
 
 void AutomationProvider::AddLoginHandler(NavigationController* tab,
                                          LoginHandler* handler) {
   login_handler_map_[tab] = handler;
 }
 
 void AutomationProvider::RemoveLoginHandler(NavigationController* tab) {
   DCHECK(login_handler_map_[tab]);
@@ skipping 247 matching lines @@
                         GetPageCurrentEncoding)
     IPC_MESSAGE_HANDLER(AutomationMsg_OverrideEncoding, OverrideEncoding)
     IPC_MESSAGE_HANDLER(AutomationMsg_SavePackageShouldPromptUser,
                         SavePackageShouldPromptUser)
     IPC_MESSAGE_HANDLER(AutomationMsg_WindowTitle, GetWindowTitle)
 #if defined(OS_WIN)
     // Depends on ExternalTabContainer, so Windows-only
     IPC_MESSAGE_HANDLER(AutomationMsg_SetEnableExtensionAutomation,
                         SetEnableExtensionAutomation)
 #endif
+    IPC_MESSAGE_HANDLER_DELAY_REPLY(
+        AutomationMsg_WaitForDownloadShelfVisibilityChange,
+        WaitForDownloadShelfVisibilityChange)
     IPC_MESSAGE_HANDLER(AutomationMsg_SetShelfVisibility, SetShelfVisibility)
     IPC_MESSAGE_HANDLER(AutomationMsg_BlockedPopupCount, GetBlockedPopupCount)
     IPC_MESSAGE_HANDLER(AutomationMsg_SelectAll, SelectAll)
     IPC_MESSAGE_HANDLER(AutomationMsg_Cut, Cut)
     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,
@@ skipping 83 matching lines @@
         std::string());
     if (tab_contents) {
       append_tab_response =
           GetIndexForNavigationController(&tab_contents->controller(), browser);
     }
   }
 
   if (append_tab_response < 0) {
     // The append tab failed. Remove the TabStripObserver
     if (observer) {
-      RemoveTabStripObserver(observer);
+      RemoveObserver(observer);
       delete observer;
     }
 
     AutomationMsg_AppendTab::WriteReplyParams(reply_message,
                                               append_tab_response);
     Send(reply_message);
   }
 }
 
 void AutomationProvider::NavigateToURL(int handle, const GURL& url,
@@ skipping 971 matching lines @@
         const BookmarkNode* parent = node->GetParent();
         DCHECK(parent);
         model->Remove(parent, parent->IndexOfChild(node));
         *success = true;
       }
     }
   }
   *success = false;
 }
 
+void AutomationProvider::WaitForDownloadShelfVisibilityChange(
+    int browser_handle,
+    bool desired_visibility,
+    IPC::Message* reply_message) {
+  bool success = false;
+  if (browser_tracker_->ContainsHandle(browser_handle)) {
+    bool visibility = !desired_visibility;
+    GetShelfVisibility(browser_handle, &visibility);
+    if (visibility == desired_visibility) {
+      success = true;
+    } else {
+      Browser* browser = browser_tracker_->GetResource(browser_handle);
+      notification_observer_list_.AddObserver(
+          new DownloadShelfVisibilityObserver(this,
+                                              browser,
+                                              desired_visibility,
+                                              reply_message));
+      return;
+    }
+  }
+  AutomationMsg_WaitForDownloadShelfVisibilityChange::WriteReplyParams(
+      reply_message, success);
+  Send(reply_message);
+}
+
 // Sample json input: { "command": "SetWindowDimensions",
 //                      "x": 20,         # optional
 //                      "y": 20,         # optional
 //                      "width": 800,    # optional
 //                      "height": 600 }  # optional
 void AutomationProvider::SetWindowDimensions(Browser* browser,
                                              DictionaryValue* args,
                                              IPC::Message* reply_message) {
   gfx::Rect rect = browser->window()->GetRestoredBounds();
   int x, y, width, height;
@@ skipping 1923 matching lines @@
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)
 
 void AutomationProvider::ResetToDefaultTheme() {
   profile_->ClearTheme();
 }