Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5501)

Unified Diff: chrome/browser/lifetime/browser_close_manager_browsertest.cc

Issue 26938003: Don't prompt to save malicious downloads on exit (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updated comments Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/lifetime/browser_close_manager_browsertest.cc
diff --git a/chrome/browser/lifetime/browser_close_manager_browsertest.cc b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
index ce61b244028c4b7e4ea4a2f1fbdc7fe02d91fae3..f8fb49148fb53dea1514ca82b8c08c2b70d9b77d 100644
--- a/chrome/browser/lifetime/browser_close_manager_browsertest.cc
+++ b/chrome/browser/lifetime/browser_close_manager_browsertest.cc
@@ -31,6 +31,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/download_test_observer.h"
#include "content/public/test/test_navigation_observer.h"
+#include "content/test/net/url_request_mock_http_job.h"
#include "content/test/net/url_request_slow_download_job.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
@@ -121,6 +122,7 @@ class TestBrowserCloseManager : public BrowserCloseManager {
enum UserChoice {
USER_CHOICE_USER_CANCELS_CLOSE,
USER_CHOICE_USER_ALLOWS_CLOSE,
+ NO_USER_CHOICE
};
static void AttemptClose(UserChoice user_choice) {
@@ -135,7 +137,9 @@ class TestBrowserCloseManager : public BrowserCloseManager {
virtual void ConfirmCloseWithPendingDownloads(
int download_count,
const base::Callback<void(bool)>& callback) OVERRIDE {
+ EXPECT_NE(NO_USER_CHOICE, user_choice_);
switch (user_choice_) {
+ case NO_USER_CHOICE:
case USER_CHOICE_USER_CANCELS_CLOSE: {
callback.Run(false);
break;
@@ -619,6 +623,52 @@ IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
EXPECT_TRUE(chrome::BrowserIterator().done());
}
+// Test shutdown with a DANGEROUS_URL download undecided.
+IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest,
+ TestWithDangerousUrlDownload) {
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
+
+ // Run a dangerous download, but the user doesn't make a decision.
+ // This test uses a .swf because it will trigger a dangerous download
+ // warning on every platform.
+ base::FilePath file(FILE_PATH_LITERAL("downloads/dangerous/dangerous.swf"));
+ GURL download_url(content::URLRequestMockHTTPJob::GetMockUrl(file));
+ content::DownloadTestObserverInterrupted observer(
+ content::BrowserContext::GetDownloadManager(browser()->profile()),
+ 1,
+ content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_QUIT);
+ ui_test_utils::NavigateToURLWithDisposition(
+ browser(),
+ GURL(download_url),
+ NEW_BACKGROUND_TAB,
+ ui_test_utils::BROWSER_TEST_NONE);
+ observer.WaitForFinished();
+
+ // Change the type of the dangerous download to DANGEROUS_URL, since the
+ // browser still prompts for DANGEROUS_FILE.
+ std::vector<content::DownloadItem*> download_vector;
+ content::BrowserContext::GetDownloadManager(browser()->profile())->
+ GetAllDownloads(&download_vector);
+ EXPECT_EQ(1u, download_vector.size());
+ download_vector.at(0)->SetDangerType(
+ content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL);
asanka 2013/10/15 21:39:08 It would be great if we didn't add a public interf
+
+ // Check that the download manager has the expected state.
+ EXPECT_EQ(1, content::BrowserContext::GetDownloadManager(
+ browser()->profile())->InProgressCount());
+ EXPECT_EQ(0, content::BrowserContext::GetDownloadManager(
+ browser()->profile())->NonDangerousInProgressCount());
+
+ // Close the browser with no user action.
+ RepeatedNotificationObserver close_observer(
+ chrome::NOTIFICATION_BROWSER_CLOSED, 1);
+ TestBrowserCloseManager::AttemptClose(
+ TestBrowserCloseManager::NO_USER_CHOICE);
+ close_observer.Wait();
+ EXPECT_TRUE(browser_shutdown::IsTryingToQuit());
+ EXPECT_TRUE(chrome::BrowserIterator().done());
+}
+
// Test shutdown with a download in progress.
IN_PROC_BROWSER_TEST_P(BrowserCloseManagerBrowserTest, TestWithDownloads) {
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

Powered by Google App Engine
This is Rietveld 408576698