| Index: chrome/browser/download/download_extension_test.cc
|
| diff --git a/chrome/browser/download/download_extension_test.cc b/chrome/browser/download/download_extension_test.cc
|
| index 70a37b6224d19db7d12e04046cf6c8a57d583c95..45807caae986e32be0fb5ec8ab037decda23c609 100644
|
| --- a/chrome/browser/download/download_extension_test.cc
|
| +++ b/chrome/browser/download/download_extension_test.cc
|
| @@ -57,8 +57,8 @@ class DownloadExtensionTest : public InProcessBrowserTest {
|
| void CreateSlowTestDownloads(
|
| size_t count, DownloadManager::DownloadVector* items) {
|
| for (size_t i = 0; i < count; ++i) {
|
| - scoped_ptr<DownloadTestObserver> observer(
|
| - CreateDownloadObserver(1, DownloadItem::IN_PROGRESS));
|
| + scoped_ptr<DownloadTestObserverInProgress> observer(
|
| + CreateInProgressDownloadObserver(1));
|
| GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| browser(), slow_download_url, CURRENT_TAB,
|
| @@ -72,8 +72,8 @@ class DownloadExtensionTest : public InProcessBrowserTest {
|
| }
|
|
|
| DownloadItem* CreateSlowTestDownload() {
|
| - scoped_ptr<DownloadTestObserver> observer(
|
| - CreateDownloadObserver(1, DownloadItem::IN_PROGRESS));
|
| + scoped_ptr<DownloadTestObserverInProgress> observer(
|
| + CreateInProgressDownloadObserver(1));
|
| GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
|
| DownloadManager* manager = GetDownloadManager();
|
|
|
| @@ -106,8 +106,8 @@ class DownloadExtensionTest : public InProcessBrowserTest {
|
| }
|
|
|
| void FinishPendingSlowDownloads() {
|
| - scoped_ptr<DownloadTestObserver> observer(
|
| - CreateDownloadObserver(1, DownloadItem::COMPLETE));
|
| + scoped_ptr<DownloadTestObserverTerminal> observer(
|
| + CreateDownloadObserver(1));
|
| GURL finish_url(URLRequestSlowDownloadJob::kFinishDownloadUrl);
|
| ui_test_utils::NavigateToURLWithDisposition(
|
| browser(), finish_url, NEW_FOREGROUND_TAB,
|
| @@ -115,12 +115,16 @@ class DownloadExtensionTest : public InProcessBrowserTest {
|
| observer->WaitForFinished();
|
| }
|
|
|
| - DownloadTestObserver* CreateDownloadObserver(
|
| - size_t download_count,
|
| - DownloadItem::DownloadState finished_state) {
|
| - return new DownloadTestObserver(
|
| - GetDownloadManager(), download_count, finished_state, true,
|
| - DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL);
|
| + DownloadTestObserverTerminal* CreateDownloadObserver(size_t download_count) {
|
| + return new DownloadTestObserverTerminal(
|
| + GetDownloadManager(), download_count, true,
|
| + DownloadTestObserverTerminal::ON_DANGEROUS_DOWNLOAD_FAIL);
|
| + }
|
| +
|
| + DownloadTestObserverInProgress* CreateInProgressDownloadObserver(
|
| + size_t download_count) {
|
| + return new DownloadTestObserverInProgress(GetDownloadManager(),
|
| + download_count);
|
| }
|
|
|
| bool RunFunction(UIThreadExtensionFunction* function,
|
|
|