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..6f6cdfb7d2604a89e0ccde30bcf8f56b31aaac42 100644 |
--- a/chrome/browser/download/download_extension_test.cc |
+++ b/chrome/browser/download/download_extension_test.cc |
@@ -58,7 +58,7 @@ class DownloadExtensionTest : public InProcessBrowserTest { |
size_t count, DownloadManager::DownloadVector* items) { |
for (size_t i = 0; i < count; ++i) { |
scoped_ptr<DownloadTestObserver> observer( |
- CreateDownloadObserver(1, DownloadItem::IN_PROGRESS)); |
+ CreateInProgressDownloadObserver(1)); |
GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl); |
ui_test_utils::NavigateToURLWithDisposition( |
browser(), slow_download_url, CURRENT_TAB, |
@@ -73,7 +73,7 @@ class DownloadExtensionTest : public InProcessBrowserTest { |
DownloadItem* CreateSlowTestDownload() { |
scoped_ptr<DownloadTestObserver> observer( |
- CreateDownloadObserver(1, DownloadItem::IN_PROGRESS)); |
+ CreateInProgressDownloadObserver(1)); |
GURL slow_download_url(URLRequestSlowDownloadJob::kUnknownSizeUrl); |
DownloadManager* manager = GetDownloadManager(); |
@@ -107,7 +107,7 @@ class DownloadExtensionTest : public InProcessBrowserTest { |
void FinishPendingSlowDownloads() { |
scoped_ptr<DownloadTestObserver> observer( |
- CreateDownloadObserver(1, DownloadItem::COMPLETE)); |
+ CreateDownloadObserver(1)); |
GURL finish_url(URLRequestSlowDownloadJob::kFinishDownloadUrl); |
ui_test_utils::NavigateToURLWithDisposition( |
browser(), finish_url, NEW_FOREGROUND_TAB, |
@@ -115,14 +115,18 @@ class DownloadExtensionTest : public InProcessBrowserTest { |
observer->WaitForFinished(); |
} |
- DownloadTestObserver* CreateDownloadObserver( |
- size_t download_count, |
- DownloadItem::DownloadState finished_state) { |
+ DownloadTestObserver* CreateDownloadObserver(size_t download_count) { |
return new DownloadTestObserver( |
- GetDownloadManager(), download_count, finished_state, true, |
+ GetDownloadManager(), download_count, true, |
DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL); |
} |
+ DownloadTestObserver* CreateInProgressDownloadObserver( |
+ size_t download_count) { |
+ return new DownloadTestObserverInProgress(GetDownloadManager(), |
+ download_count); |
+ } |
+ |
bool RunFunction(UIThreadExtensionFunction* function, |
const std::string& args) { |
// extension_function_test_utils::RunFunction() does not take |