1 files changed, 28 insertions, 7 deletions

diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 93ad3d5..bd341a6 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -213,11 +213,6 @@ NotificationObserver* AutomationProvider::AddNavigationStatusListener(
   return observer;
 }
 
-void AutomationProvider::RemoveNavigationStatusListener(
-    NotificationObserver* obs) {
-  notification_observer_list_.RemoveObserver(obs);
-}
-
 NotificationObserver* AutomationProvider::AddTabStripObserver(
     Browser* parent,
     IPC::Message* reply_message) {
@@ -228,7 +223,7 @@ NotificationObserver* AutomationProvider::AddTabStripObserver(
   return observer;
 }
 
-void AutomationProvider::RemoveTabStripObserver(NotificationObserver* obs) {
+void AutomationProvider::RemoveObserver(NotificationObserver* obs) {
   notification_observer_list_.RemoveObserver(obs);
 }
 
@@ -496,6 +491,9 @@ void AutomationProvider::OnMessageReceived(const IPC::Message& message) {
     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)
@@ -599,7 +597,7 @@ void AutomationProvider::AppendTab(int handle, const GURL& url,
   if (append_tab_response < 0) {
     // The append tab failed. Remove the TabStripObserver
     if (observer) {
-      RemoveTabStripObserver(observer);
+      RemoveObserver(observer);
       delete observer;
     }
 
@@ -1591,6 +1589,29 @@ void AutomationProvider::RemoveBookmark(int handle,
   *success = false;
 }
 
+void AutomationProvider::WaitForDownloadShelfVisibilityChange(
+    int browser_handle,
+    bool visibility,
+    IPC::Message* reply_message) {
+  bool success = false;
+  if (browser_tracker_->ContainsHandle(browser_handle)) {
+    Browser* browser = browser_tracker_->GetResource(browser_handle);
+    if (browser->window()->IsDownloadShelfVisible() == visibility) {
+      success = true;
+    } else {
+      notification_observer_list_.AddObserver(
+          new DownloadShelfVisibilityObserver(this,
+                                              browser,
+                                              visibility,
+                                              reply_message));
+      return;
+    }
+  }
+  AutomationMsg_WaitForDownloadShelfVisibilityChange::WriteReplyParams(
+      reply_message, success);
+  Send(reply_message);
+}
+
 // Sample json input: { "command": "GetHistoryInfo",
 //                      "search_text": "some text" }
 // Refer chrome/test/pyautolib/history_info.py for sample json output.