Remove the DownloadItem::TogglePause() interface.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright 2012 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/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2639 matching lines @@
   DownloadManager* download_manager =
       BrowserContext::GetDownloadManager(browser->profile());
   DownloadItem* selected_item = download_manager->GetDownload(id);
   if (!selected_item) {
     AutomationJSONReply(this, reply_message)
         .SendError(StringPrintf("No download with an id of %d\n", id));
     return;
   }
 
   // We need to be IN_PROGRESS for these actions.
-  if ((action == "toggle_pause" || action == "cancel") &&
+  if ((action == "pause" || action == "resume" || action == "cancel") &&
       !selected_item->IsInProgress()) {
     AutomationJSONReply(this, reply_message)
         .SendError("Selected DownloadItem is not in progress.");
   }
 
   if (action == "open") {
     selected_item->AddObserver(
         new AutomationProviderDownloadUpdatedObserver(
             this, reply_message, true, browser->profile()->IsOffTheRecord()));
     selected_item->OpenDownload();
@@ skipping 11 matching lines @@
         this, reply_message, download_manager);
     selected_item->Remove();
   } else if (action == "decline_dangerous_download") {
     new AutomationProviderDownloadModelChangedObserver(
         this, reply_message, download_manager);
     selected_item->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
   } else if (action == "save_dangerous_download") {
     selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
         this, reply_message, false, browser->profile()->IsOffTheRecord()));
     selected_item->DangerousDownloadValidated();
-  } else if (action == "toggle_pause") {
-    selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
-        this, reply_message, false, browser->profile()->IsOffTheRecord()));
-    // This will still return if download has already completed.
-    selected_item->TogglePause();
+  } else if (action == "pause") {
+    if (!selected_item->IsInProgress() || selected_item->IsPaused()) {
+      // Action would be a no-op; respond right from here.  No-op implies
+      // the test is poorly written or failing, so make it an error return.
+      if (!selected_item->IsInProgress()) {
+        AutomationJSONReply(this, reply_message)
+            .SendError("Action 'pause' called on download in termal state.");
+      } else {
+        AutomationJSONReply(this, reply_message)
+            .SendError("Action 'pause' called on already paused download.");
+      }
+    } else {
+      selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
+          this, reply_message, false, browser->profile()->IsOffTheRecord()));
+      selected_item->Pause();
+    }
+  } else if (action == "resume") {
+    if (!selected_item->IsInProgress() || !selected_item->IsPaused()) {
+      // Action would be a no-op; respond right from here.  No-op implies
+      // the test is poorly written or failing, so make it an error return.
+      if (!selected_item->IsInProgress()) {
+        AutomationJSONReply(this, reply_message)
+            .SendError("Action 'resume' called on download in termal state.");
+      } else {
+        AutomationJSONReply(this, reply_message)
+            .SendError("Action 'resume' called on unpaused download.");
+      }
+    } else {
+      selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
+          this, reply_message, false, browser->profile()->IsOffTheRecord()));
+      selected_item->Resume();
+    }
   } else if (action == "cancel") {
     selected_item->AddObserver(new AutomationProviderDownloadUpdatedObserver(
         this, reply_message, false, browser->profile()->IsOffTheRecord()));
     selected_item->Cancel(true);
   } else {
     AutomationJSONReply(this, reply_message)
         .SendError(StringPrintf("Invalid action '%s' given.", action.c_str()));
   }
 }
 
@@ skipping 3569 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }