A few minor changes to the chrome.downloads extension API

chrome/browser/download/download_danger_prompt_browsertest.cc

 // Copyright (c) 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 "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/download/download_danger_prompt.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 68 matching lines @@
     EXPECT_CALL(download_, AddObserver(_))
       .WillOnce(SaveArg<0>(&download_observer_));
     EXPECT_CALL(download_, RemoveObserver(Eq(ByRef(download_observer_))));
   }
 
   void CreatePrompt() {
     prompt_ = DownloadDangerPrompt::Create(
         &download_,
         browser()->tab_strip_model()->GetActiveWebContents(),
         false,
-        base::Bind(&DownloadDangerPromptTest::PromptCallback, this,
-                   DownloadDangerPrompt::ACCEPT),
-        base::Bind(&DownloadDangerPromptTest::PromptCallback, this,
-                   DownloadDangerPrompt::CANCEL));
+        base::Bind(&DownloadDangerPromptTest::PromptCallback, this));
     content::RunAllPendingInMessageLoop();
   }
 
   void PromptCallback(DownloadDangerPrompt::Action action) {
     EXPECT_FALSE(did_receive_callback_);
     EXPECT_EQ(expected_action_, action);
     did_receive_callback_ = true;
     prompt_ = NULL;
   }
 
   content::MockDownloadItem download_;
   content::DownloadItem::Observer* download_observer_;
   DownloadDangerPrompt* prompt_;
   DownloadDangerPrompt::Action expected_action_;
   bool did_receive_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadDangerPromptTest);
 };
 
 IN_PROC_BROWSER_TEST_F(DownloadDangerPromptTest, TestAll) {
   OpenNewTab();
 
-  // The Accept action should cause the accept callback to be invoked.
+  // Clicking the Accept button should invoke the ACCEPT action.
   SetUpExpectations(DownloadDangerPrompt::ACCEPT);
   SimulatePromptAction(DownloadDangerPrompt::ACCEPT);
   VerifyExpectations();
 
-  // The Discard action should cause the discard callback to be invoked.
+  // Clicking the Cancel button should invoke the CANCEL action.
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
   SimulatePromptAction(DownloadDangerPrompt::CANCEL);
   VerifyExpectations();
 
   // If the download is no longer dangerous (because it was accepted), the
-  // dialog should dismiss itself.
-  SetUpExpectations(DownloadDangerPrompt::CANCEL);
+  // dialog should DISMISS itself.
+  SetUpExpectations(DownloadDangerPrompt::DISMISS);
   EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(false));
   download_observer()->OnDownloadUpdated(&download());
   VerifyExpectations();
 
-  // If the download is in a terminal state then the dialog should dismiss
+  // If the download is in a terminal state then the dialog should DISMISS
   // itself.
-  SetUpExpectations(DownloadDangerPrompt::CANCEL);
+  SetUpExpectations(DownloadDangerPrompt::DISMISS);
   EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(true));
   EXPECT_CALL(download(), IsDone()).WillOnce(Return(true));
   download_observer()->OnDownloadUpdated(&download());
   VerifyExpectations();
 
   // If the download is dangerous and is not in a terminal state, don't dismiss
   // the dialog.
   SetUpExpectations(DownloadDangerPrompt::ACCEPT);
   EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(true));
   EXPECT_CALL(download(), IsDone()).WillOnce(Return(false));
   download_observer()->OnDownloadUpdated(&download());
   SimulatePromptAction(DownloadDangerPrompt::ACCEPT);
   VerifyExpectations();
 
-  // If the containing tab is closed, the dialog should be canceled.
+  // If the containing tab is closed, the dialog should DISMISS itself.
   OpenNewTab();
+  // TODO(benjhayden):
+  // SetUpExpectations(DownloadDangerPrompt::DISMISS);
   SetUpExpectations(DownloadDangerPrompt::CANCEL);
   chrome::CloseTab(browser());
   VerifyExpectations();
 }