OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/download/download_browsertest.h" | 5 #include "chrome/browser/download/download_browsertest.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <sstream> | 8 #include <sstream> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1700 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1711 // job. The download isn't continuable, so there's no intermediate file. | 1711 // job. The download isn't continuable, so there's no intermediate file. |
1712 history::DownloadRow& row1(downloads_in_database->at(0)); | 1712 history::DownloadRow& row1(downloads_in_database->at(0)); |
1713 EXPECT_EQ(DestinationFile(browser(), file), row1.target_path); | 1713 EXPECT_EQ(DestinationFile(browser(), file), row1.target_path); |
1714 EXPECT_TRUE(row1.current_path.empty()); | 1714 EXPECT_TRUE(row1.current_path.empty()); |
1715 ASSERT_EQ(2u, row1.url_chain.size()); | 1715 ASSERT_EQ(2u, row1.url_chain.size()); |
1716 EXPECT_EQ(redirect_url.spec(), row1.url_chain[0].spec()); | 1716 EXPECT_EQ(redirect_url.spec(), row1.url_chain[0].spec()); |
1717 EXPECT_EQ(download_url.spec(), row1.url_chain[1].spec()); | 1717 EXPECT_EQ(download_url.spec(), row1.url_chain[1].spec()); |
1718 EXPECT_EQ(history::DownloadDangerType::NOT_DANGEROUS, row1.danger_type); | 1718 EXPECT_EQ(history::DownloadDangerType::NOT_DANGEROUS, row1.danger_type); |
1719 EXPECT_LE(start, row1.start_time); | 1719 EXPECT_LE(start, row1.start_time); |
1720 EXPECT_GE(end, row1.end_time); | 1720 EXPECT_GE(end, row1.end_time); |
1721 EXPECT_EQ(net::URLRequestSlowDownloadJob::kFirstDownloadSize, | 1721 EXPECT_EQ(0, row1.received_bytes); // There's no ETag. So the intermediate |
svaldez
2016/03/09 19:27:33
Is this just an incidental change?
asanka
2016/03/10 16:48:08
This is a result of the explicit split between the
| |
1722 row1.received_bytes); | 1722 // state is discarded. |
1723 EXPECT_EQ(net::URLRequestSlowDownloadJob::kFirstDownloadSize | 1723 EXPECT_EQ(net::URLRequestSlowDownloadJob::kFirstDownloadSize + |
1724 + net::URLRequestSlowDownloadJob::kSecondDownloadSize, | 1724 net::URLRequestSlowDownloadJob::kSecondDownloadSize, |
1725 row1.total_bytes); | 1725 row1.total_bytes); |
1726 EXPECT_EQ(history::DownloadState::INTERRUPTED, row1.state); | 1726 EXPECT_EQ(history::DownloadState::INTERRUPTED, row1.state); |
1727 EXPECT_EQ(history::ToHistoryDownloadInterruptReason( | 1727 EXPECT_EQ(history::ToHistoryDownloadInterruptReason( |
1728 content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED), | 1728 content::DOWNLOAD_INTERRUPT_REASON_NETWORK_FAILED), |
1729 row1.interrupt_reason); | 1729 row1.interrupt_reason); |
1730 EXPECT_FALSE(row1.opened); | 1730 EXPECT_FALSE(row1.opened); |
1731 } | 1731 } |
1732 | 1732 |
1733 // Make sure a dangerous file shows up properly in the history. | 1733 // Make sure a dangerous file shows up properly in the history. |
1734 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadHistoryDangerCheck) { | 1734 IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadHistoryDangerCheck) { |
(...skipping 1790 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
3525 | 3525 |
3526 scoped_ptr<content::DownloadTestObserver> observer(DangerousDownloadWaiter( | 3526 scoped_ptr<content::DownloadTestObserver> observer(DangerousDownloadWaiter( |
3527 browser(), 1, content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY)); | 3527 browser(), 1, content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_DENY)); |
3528 ui_test_utils::NavigateToURL(browser(), extension_url); | 3528 ui_test_utils::NavigateToURL(browser(), extension_url); |
3529 | 3529 |
3530 observer->WaitForFinished(); | 3530 observer->WaitForFinished(); |
3531 | 3531 |
3532 // Download shelf should close. | 3532 // Download shelf should close. |
3533 EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible()); | 3533 EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible()); |
3534 } | 3534 } |
OLD | NEW |