diff options
20 files changed, 84 insertions, 100 deletions
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc index 5482a50..5b774df 100644 --- a/chrome/browser/download/chrome_download_manager_delegate.cc +++ b/chrome/browser/download/chrome_download_manager_delegate.cc @@ -111,7 +111,7 @@ base::FilePath GetPlatformDownloadPath(Profile* profile, // - Not Complete, and there's no intermediate file: GetFullPath() will be // empty. This shouldn't happen since CanShowInFolder() returns false and // this function shouldn't have been called. - if (download->IsComplete()) { + if (download->GetState() == DownloadItem::COMPLETE) { DCHECK(!download->GetTargetFilePath().empty()); return download->GetTargetFilePath(); } @@ -369,7 +369,7 @@ void ChromeDownloadManagerDelegate::ChooseSavePath( } void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) { - DCHECK(download->IsComplete()); + DCHECK_EQ(DownloadItem::COMPLETE, download->GetState()); if (!download->CanOpenDownload()) return; platform_util::OpenItem(GetPlatformDownloadPath(profile_, download)); diff --git a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc index e72b837..abb3b98 100644 --- a/chrome/browser/download/chrome_download_manager_delegate_unittest.cc +++ b/chrome/browser/download/chrome_download_manager_delegate_unittest.cc @@ -232,8 +232,6 @@ content::MockDownloadItem* .WillByDefault(Return(false)); ON_CALL(*item, IsDangerous()) .WillByDefault(Return(false)); - ON_CALL(*item, IsInProgress()) - .WillByDefault(Return(true)); ON_CALL(*item, IsTemporary()) .WillByDefault(Return(false)); EXPECT_CALL(*download_manager_, GetDownload(id)) diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 403ba45..42e36970 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -147,7 +147,7 @@ class PercentWaiter : public content::DownloadItem::Observer { } bool WaitForFinished() { - if (item_->IsComplete()) { + if (item_->GetState() == DownloadItem::COMPLETE) { return item_->PercentComplete() == 100; } waiting_ = true; @@ -161,13 +161,13 @@ class PercentWaiter : public content::DownloadItem::Observer { DCHECK_EQ(item_, item); if (!error_ && ((prev_percent_ > item_->PercentComplete()) || - (item_->IsComplete() && + (item_->GetState() == DownloadItem::COMPLETE && (item_->PercentComplete() != 100)))) { error_ = true; if (waiting_) MessageLoopForUI::current()->Quit(); } - if (item_->IsComplete() && waiting_) + if (item_->GetState() == DownloadItem::COMPLETE && waiting_) MessageLoopForUI::current()->Quit(); } @@ -2725,7 +2725,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_Renaming) { EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible()); content::DownloadItem* item = manager->GetDownload(index); ASSERT_TRUE(item); - ASSERT_TRUE(item->IsComplete()); + ASSERT_EQ(DownloadItem::COMPLETE, item->GetState()); base::FilePath target_path(item->GetTargetFilePath()); EXPECT_EQ(std::string("a_zip_file") + (index == 0 ? std::string(".zip") : @@ -2843,14 +2843,14 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadTest_PauseResumeCancel) { ASSERT_TRUE(download_item); ASSERT_FALSE(download_item->GetTargetFilePath().empty()); EXPECT_FALSE(download_item->IsPaused()); - EXPECT_FALSE(download_item->IsCancelled()); + EXPECT_NE(DownloadItem::CANCELLED, download_item->GetState()); download_item->Pause(); EXPECT_TRUE(download_item->IsPaused()); download_item->Resume(); EXPECT_FALSE(download_item->IsPaused()); - EXPECT_FALSE(download_item->IsCancelled()); + EXPECT_NE(DownloadItem::CANCELLED, download_item->GetState()); download_item->Cancel(true); - EXPECT_TRUE(download_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, download_item->GetState()); } // The Mac downloaded files quarantine feature is implemented by the diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc index 3e98b6f..2e3e9c7 100644 --- a/chrome/browser/download/download_danger_prompt.cc +++ b/chrome/browser/download/download_danger_prompt.cc @@ -95,7 +95,8 @@ void DownloadDangerPromptImpl::OnDownloadUpdated( content::DownloadItem* download) { // If the download is nolonger dangerous (accepted externally) or the download // doesn't exist anymore, the download danger prompt is no longer necessary. - if (!download->IsInProgress() || !download->IsDangerous()) + if ((download->GetState() != content::DownloadItem::IN_PROGRESS) + || !download->IsDangerous()) Cancel(); } diff --git a/chrome/browser/download/download_danger_prompt_browsertest.cc b/chrome/browser/download/download_danger_prompt_browsertest.cc index 5dc13d7..bbdddfe 100644 --- a/chrome/browser/download/download_danger_prompt_browsertest.cc +++ b/chrome/browser/download/download_danger_prompt_browsertest.cc @@ -124,14 +124,16 @@ IN_PROC_BROWSER_TEST_F(DownloadDangerPromptTest, TestAll) { // If the download is no longer in-progress, the dialog should dismiss itself. SetUpExpectations(DownloadDangerPrompt::CANCEL); - EXPECT_CALL(download(), IsInProgress()).WillOnce(Return(false)); + EXPECT_CALL(download(), GetState()).WillOnce( + Return(content::DownloadItem::CANCELLED)); download_observer()->OnDownloadUpdated(&download()); VerifyExpectations(); // If the download is no longer dangerous (because it was accepted), the // dialog should dismiss itself. SetUpExpectations(DownloadDangerPrompt::CANCEL); - EXPECT_CALL(download(), IsInProgress()).WillOnce(Return(true)); + EXPECT_CALL(download(), GetState()).WillOnce( + Return(content::DownloadItem::IN_PROGRESS)); EXPECT_CALL(download(), IsDangerous()).WillOnce(Return(false)); download_observer()->OnDownloadUpdated(&download()); VerifyExpectations(); diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index d5ac5cb..051b9ff 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -399,7 +399,8 @@ bool DownloadItemModel::ShouldRemoveFromShelfWhenComplete() const { return true; // If the download is interrupted or cancelled, it should not be removed. - if (download_->IsInterrupted() || download_->IsCancelled()) + DownloadItem::DownloadState state = download_->GetState(); + if (state == DownloadItem::INTERRUPTED || state == DownloadItem::CANCELLED) return false; // If the download is dangerous or malicious, we should display a warning on @@ -466,7 +467,7 @@ string16 DownloadItemModel::GetProgressSizesString() const { } string16 DownloadItemModel::GetInProgressStatusString() const { - DCHECK(download_->IsInProgress()); + DCHECK_EQ(DownloadItem::IN_PROGRESS, download_->GetState()); TimeDelta time_remaining; // time_remaining is only known if the download isn't paused. diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index 81805c5..4f9aede 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -66,7 +66,6 @@ class DownloadItemModelTest : public testing::Test { void SetupDownloadItemDefaults() { ON_CALL(item_, GetReceivedBytes()).WillByDefault(Return(1)); ON_CALL(item_, GetTotalBytes()).WillByDefault(Return(2)); - ON_CALL(item_, IsInProgress()).WillByDefault(Return(true)); ON_CALL(item_, TimeRemaining(_)).WillByDefault(Return(false)); ON_CALL(item_, GetMimeType()).WillByDefault(Return("text/html")); ON_CALL(item_, AllDataSaved()).WillByDefault(Return(false)); @@ -93,9 +92,6 @@ class DownloadItemModelTest : public testing::Test { (reason == content::DOWNLOAD_INTERRUPT_REASON_NONE) ? DownloadItem::IN_PROGRESS : DownloadItem::INTERRUPTED)); - EXPECT_CALL(item_, IsInProgress()) - .WillRepeatedly(Return( - reason == content::DOWNLOAD_INTERRUPT_REASON_NONE)); } content::MockDownloadItem& item() { @@ -396,14 +392,6 @@ TEST_F(DownloadItemModelTest, ShouldRemoveFromShelfWhenComplete) { .WillRepeatedly(Return(test_case.is_auto_open)); EXPECT_CALL(item(), GetState()) .WillRepeatedly(Return(test_case.state)); - EXPECT_CALL(item(), IsCancelled()) - .WillRepeatedly(Return(test_case.state == DownloadItem::CANCELLED)); - EXPECT_CALL(item(), IsComplete()) - .WillRepeatedly(Return(test_case.state == DownloadItem::COMPLETE)); - EXPECT_CALL(item(), IsInProgress()) - .WillRepeatedly(Return(test_case.state == DownloadItem::IN_PROGRESS)); - EXPECT_CALL(item(), IsInterrupted()) - .WillRepeatedly(Return(test_case.state == DownloadItem::INTERRUPTED)); EXPECT_CALL(item(), IsDangerous()) .WillRepeatedly(Return(test_case.is_dangerous)); diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index c69abed..c1c3b7f9 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc @@ -101,7 +101,7 @@ content::DownloadManager* DownloadShelf::GetDownloadManager() { } void DownloadShelf::ShowDownload(DownloadItem* download) { - if (download->IsComplete() && + if (download->GetState() == DownloadItem::COMPLETE && DownloadItemModel(download).ShouldRemoveFromShelfWhenComplete()) { return; } diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc index 66128d2..48fb237 100644 --- a/chrome/browser/download/download_shelf_context_menu.cc +++ b/chrome/browser/download/download_shelf_context_menu.cc @@ -47,9 +47,9 @@ ui::SimpleMenuModel* DownloadShelfContextMenu::GetMenuModel() { if (download_model.IsMalicious()) model = GetMaliciousMenuModel(); - else if (download_item_->IsComplete()) + else if (download_item_->GetState() == DownloadItem::COMPLETE) model = GetFinishedMenuModel(); - else if (download_item_->IsInterrupted()) + else if (download_item_->GetState() == DownloadItem::INTERRUPTED) model = GetInterruptedMenuModel(); else model = GetInProgressMenuModel(); @@ -75,7 +75,7 @@ bool DownloadShelfContextMenu::IsCommandIdEnabled(int command_id) const { case CANCEL: return download_item_->IsPartialDownload(); case TOGGLE_PAUSE: - return download_item_->IsInProgress(); + return download_item_->GetState() == DownloadItem::IN_PROGRESS; case DISCARD: case KEEP: case LEARN_MORE_SCANNING: @@ -183,7 +183,8 @@ string16 DownloadShelfContextMenu::GetLabelForCommandId(int command_id) const { case SHOW_IN_FOLDER: return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_SHOW); case OPEN_WHEN_COMPLETE: - if (download_item_ && download_item_->IsInProgress()) + if (download_item_ && + download_item_->GetState() == DownloadItem::IN_PROGRESS) return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_OPEN_WHEN_COMPLETE); return l10n_util::GetStringUTF16(IDS_DOWNLOAD_MENU_OPEN); case ALWAYS_OPEN_TYPE: diff --git a/chrome/browser/download/download_shelf_unittest.cc b/chrome/browser/download/download_shelf_unittest.cc index 48045c4..21ca398 100644 --- a/chrome/browser/download/download_shelf_unittest.cc +++ b/chrome/browser/download/download_shelf_unittest.cc @@ -57,8 +57,8 @@ DownloadShelfTest::DownloadShelfTest() .WillByDefault(Return(DownloadItem::TARGET_DISPOSITION_OVERWRITE)); ON_CALL(*download_item_, GetURL()) .WillByDefault(ReturnRefOfCopy(GURL("http://example.com/foo"))); - ON_CALL(*download_item_, IsComplete()).WillByDefault(Return(false)); - ON_CALL(*download_item_, IsInProgress()).WillByDefault(Return(true)); + ON_CALL(*download_item_, GetState()) + .WillByDefault(Return(DownloadItem::IN_PROGRESS)); ON_CALL(*download_item_, IsTemporary()).WillByDefault(Return(false)); ON_CALL(*download_item_, ShouldOpenFileBasedOnExtension()) .WillByDefault(Return(false)); @@ -148,8 +148,8 @@ TEST_F(DownloadShelfTest, AddDelayedCompletedDownload) { EXPECT_FALSE(shelf()->did_add_download()); EXPECT_FALSE(shelf()->IsShowing()); - EXPECT_CALL(*download_item(), IsComplete()) - .WillRepeatedly(Return(true)); + EXPECT_CALL(*download_item(), GetState()) + .WillRepeatedly(Return(DownloadItem::COMPLETE)); base::RunLoop run_loop; run_loop.RunUntilIdle(); @@ -170,8 +170,8 @@ TEST_F(DownloadShelfTest, AddDelayedCompleteNonTransientDownload) { EXPECT_FALSE(shelf()->did_add_download()); EXPECT_FALSE(shelf()->IsShowing()); - EXPECT_CALL(*download_item(), IsComplete()) - .WillRepeatedly(Return(true)); + EXPECT_CALL(*download_item(), GetState()) + .WillRepeatedly(Return(DownloadItem::COMPLETE)); EXPECT_CALL(*download_item(), ShouldOpenFileBasedOnExtension()) .WillRepeatedly(Return(false)); ASSERT_FALSE(DownloadItemModel(download_item()) diff --git a/chrome/browser/download/download_status_updater.cc b/chrome/browser/download/download_status_updater.cc index fcc1d13..646e106 100644 --- a/chrome/browser/download/download_status_updater.cc +++ b/chrome/browser/download/download_status_updater.cc @@ -67,7 +67,7 @@ bool DownloadStatusUpdater::GetProgress(float* progress, (*it)->GetManager()->GetAllDownloads(&items); for (content::DownloadManager::DownloadVector::const_iterator it = items.begin(); it != items.end(); ++it) { - if ((*it)->IsInProgress()) { + if ((*it)->GetState() == content::DownloadItem::IN_PROGRESS) { ++*download_count; if ((*it)->GetTotalBytes() <= 0) { // There may or may not be more data coming down this pipe. @@ -101,7 +101,7 @@ void DownloadStatusUpdater::OnDownloadCreated( // Ignore downloads loaded from history, which are in a terminal state. // TODO(benjhayden): Use the Observer interface to distinguish between // historical and started downloads. - if (item->IsInProgress()) { + if (item->GetState() == content::DownloadItem::IN_PROGRESS) { UpdateAppIconDownloadProgress(item); new WasInProgressData(item); } @@ -111,7 +111,7 @@ void DownloadStatusUpdater::OnDownloadCreated( void DownloadStatusUpdater::OnDownloadUpdated( content::DownloadManager* manager, content::DownloadItem* item) { - if (item->IsInProgress()) { + if (item->GetState() == content::DownloadItem::IN_PROGRESS) { // If the item was interrupted/cancelled and then resumed/restarted, then // set WasInProgress so that UpdateAppIconDownloadProgress() will be called // when it completes. diff --git a/chrome/browser/download/download_status_updater_unittest.cc b/chrome/browser/download/download_status_updater_unittest.cc index 06a137d..367399b 100644 --- a/chrome/browser/download/download_status_updater_unittest.cc +++ b/chrome/browser/download/download_status_updater_unittest.cc @@ -112,8 +112,10 @@ class DownloadStatusUpdaterTest : public testing::Test { for (int i = 0; i < item_count; ++i) { content::MockDownloadItem* item = new StrictMock<content::MockDownloadItem>; - EXPECT_CALL(*item, IsInProgress()) - .WillRepeatedly(Return(i < in_progress_count)); + content::DownloadItem::DownloadState state = + i < in_progress_count ? content::DownloadItem::IN_PROGRESS + : content::DownloadItem::CANCELLED; + EXPECT_CALL(*item, GetState()).WillRepeatedly(Return(state)); EXPECT_CALL(*item, AddObserver(_)) .WillOnce(Return()); manager_items_[manager_index].push_back(item); @@ -154,8 +156,8 @@ class DownloadStatusUpdaterTest : public testing::Test { // Transition specified item to completed. void CompleteItem(int manager_index, int item_index) { content::MockDownloadItem* item(Item(manager_index, item_index)); - EXPECT_CALL(*item, IsInProgress()) - .WillRepeatedly(Return(false)); + EXPECT_CALL(*item, GetState()) + .WillRepeatedly(Return(content::DownloadItem::COMPLETE)); updater_->OnDownloadUpdated(managers_[manager_index], item); } diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index caf1083..98dfa31 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -182,7 +182,7 @@ DownloadTargetDeterminer::Result // // A virtual path is determined for DOA downloads for display purposes. This // is why this check is performed here instead of at the start. - if (!download_->IsInProgress()) + if (download_->GetState() != DownloadItem::IN_PROGRESS) return COMPLETE; return CONTINUE; } diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc index 15b543a..05df217 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -332,8 +332,6 @@ DownloadTargetDeterminerTest::CreateActiveDownloadItem( .WillByDefault(Return(true)); ON_CALL(*item, IsDangerous()) .WillByDefault(Return(false)); - ON_CALL(*item, IsInProgress()) - .WillByDefault(Return(true)); ON_CALL(*item, IsTemporary()) .WillByDefault(Return(false)); return item; @@ -970,8 +968,8 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_InactiveDownload) { const DownloadTestCase& test_case = kInactiveTestCases[i]; scoped_ptr<content::MockDownloadItem> item( CreateActiveDownloadItem(i, test_case)); - EXPECT_CALL(*item.get(), IsInProgress()) - .WillRepeatedly(Return(false)); + EXPECT_CALL(*item.get(), GetState()) + .WillRepeatedly(Return(content::DownloadItem::CANCELLED)); // Even though one is a SAVE_AS download, no prompt will be displayed to // the user because the download is inactive. EXPECT_CALL(*delegate(), PromptUserForDownloadPath(_, _, _)) diff --git a/chrome/browser/download/download_ui_controller.cc b/chrome/browser/download/download_ui_controller.cc index f096005..c4fe34b 100644 --- a/chrome/browser/download/download_ui_controller.cc +++ b/chrome/browser/download/download_ui_controller.cc @@ -124,7 +124,7 @@ DownloadUIController::~DownloadUIController() { void DownloadUIController::OnDownloadCreated(content::DownloadManager* manager, content::DownloadItem* item) { // If this isn't a new download, there's nothing to do. - if (!item->IsInProgress()) + if (item->GetState() != content::DownloadItem::IN_PROGRESS) return; DownloadItemModel(item).SetShouldNotifyUI(true); @@ -146,7 +146,7 @@ void DownloadUIController::OnDownloadUpdated(content::DownloadManager* manager, // Can't be complete. That would imply that we didn't receive an // OnDownloadUpdated() after the target was determined. - DCHECK(!item->IsComplete()); + DCHECK_NE(content::DownloadItem::COMPLETE, item->GetState()); DownloadItemModel(item).SetShouldNotifyUI(false); delegate_->NotifyDownloadStarting(item); diff --git a/chrome/browser/download/download_ui_controller_unittest.cc b/chrome/browser/download/download_ui_controller_unittest.cc index e2d2bdc..17b7bcc 100644 --- a/chrome/browser/download/download_ui_controller_unittest.cc +++ b/chrome/browser/download/download_ui_controller_unittest.cc @@ -118,13 +118,10 @@ DownloadUIControllerTest::GetTestDelegate() { TEST_F(DownloadUIControllerTest, DownloadUIController_NotifyBasic) { scoped_ptr<MockDownloadItem> item = GetMockDownload(); DownloadUIController controller(manager(), GetTestDelegate()); - EXPECT_CALL(*item, IsInProgress()) - .WillOnce(Return(true)); EXPECT_CALL(*item, GetTargetFilePath()) .WillOnce(ReturnRefOfCopy(base::FilePath())); - EXPECT_CALL(*item, IsComplete()) - .Times(AnyNumber()) - .WillRepeatedly(Return(false)); + EXPECT_CALL(*item, GetState()) + .WillRepeatedly(Return(content::DownloadItem::IN_PROGRESS)); ASSERT_TRUE(manager_observer()); manager_observer()->OnDownloadCreated(manager(), item.get()); @@ -148,13 +145,10 @@ TEST_F(DownloadUIControllerTest, DownloadUIController_NotifyBasic) { TEST_F(DownloadUIControllerTest, DownloadUIController_NotifyReadyOnCreate) { scoped_ptr<MockDownloadItem> item = GetMockDownload(); DownloadUIController controller(manager(), GetTestDelegate()); - EXPECT_CALL(*item, IsInProgress()) - .WillOnce(Return(true)); EXPECT_CALL(*item, GetTargetFilePath()) .WillOnce(ReturnRefOfCopy(base::FilePath(FILE_PATH_LITERAL("foo")))); - EXPECT_CALL(*item, IsComplete()) - .Times(AnyNumber()) - .WillRepeatedly(Return(false)); + EXPECT_CALL(*item, GetState()) + .WillRepeatedly(Return(content::DownloadItem::IN_PROGRESS)); ASSERT_TRUE(manager_observer()); manager_observer()->OnDownloadCreated(manager(), item.get()); @@ -166,11 +160,8 @@ TEST_F(DownloadUIControllerTest, DownloadUIController_NotifyReadyOnCreate) { TEST_F(DownloadUIControllerTest, DownloadUIController_NoNotifyHistory) { scoped_ptr<MockDownloadItem> item = GetMockDownload(); DownloadUIController controller(manager(), GetTestDelegate()); - EXPECT_CALL(*item, IsInProgress()) - .WillOnce(Return(false)); - EXPECT_CALL(*item, IsComplete()) - .Times(AnyNumber()) - .WillRepeatedly(Return(true)); + EXPECT_CALL(*item, GetState()) + .WillRepeatedly(Return(content::DownloadItem::COMPLETE)); ASSERT_TRUE(manager_observer()); manager_observer()->OnDownloadCreated(manager(), item.get()); diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 1959f09..3182b52 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -348,7 +348,7 @@ void DragDownload(const DownloadItem* download, gfx::Image* icon, gfx::NativeView view) { DCHECK(download); - DCHECK(download->IsComplete()); + DCHECK_EQ(DownloadItem::COMPLETE, download->GetState()); // Set up our OLE machinery ui::OSExchangeData data; diff --git a/chrome/browser/download/save_page_browsertest.cc b/chrome/browser/download/save_page_browsertest.cc index 7a61ff3..47f6cc5 100644 --- a/chrome/browser/download/save_page_browsertest.cc +++ b/chrome/browser/download/save_page_browsertest.cc @@ -468,7 +468,7 @@ IN_PROC_BROWSER_TEST_F(SavePageBrowserTest, SaveHTMLOnlyTabDestroy) { // Close the tab; does this cancel the download? GetCurrentTab(browser())->Close(); - EXPECT_TRUE(items[0]->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, items[0]->GetState()); EXPECT_FALSE(file_util::PathExists(full_file_name)); EXPECT_FALSE(file_util::PathExists(dir)); diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/browser/extensions/api/downloads/downloads_api.cc index d13a9e9..bcf7eba 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api.cc @@ -375,7 +375,9 @@ DownloadItem* GetDownloadIfInProgress( bool include_incognito, int id) { DownloadItem* download_item = GetDownload(profile, include_incognito, id); - return download_item && download_item->IsInProgress() ? download_item : NULL; + if (download_item && (download_item->GetState() == DownloadItem::IN_PROGRESS)) + return download_item; + return NULL; } enum DownloadsFunctionName { @@ -1105,7 +1107,7 @@ bool DownloadsOpenFunction::RunImpl() { EXTENSION_FUNCTION_VALIDATE(params.get()); DownloadItem* download_item = GetDownload( profile(), include_incognito(), params->download_id); - if (!download_item || !download_item->IsComplete()) { + if (!download_item || download_item->GetState() != DownloadItem::COMPLETE) { error_ = download_extension_errors::kInvalidOperationError; return false; } @@ -1296,7 +1298,7 @@ bool ExtensionDownloadsEventRouter::DetermineFilename( *error = download_extension_errors::kTooManyListenersError; return false; } - if (!item->IsInProgress()) { + if (item->GetState() != DownloadItem::IN_PROGRESS) { *error = download_extension_errors::kInvalidOperationError; return false; } diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index 6e9c7d2..74619dc 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -639,7 +639,7 @@ class MockIconExtractorImpl : public DownloadFileIconExtractor { }; bool ItemNotInProgress(DownloadItem* item) { - return !item->IsInProgress(); + return item->GetState() != DownloadItem::IN_PROGRESS; } // Cancels the underlying DownloadItem when the ScopedCancellingItem goes out of @@ -670,7 +670,7 @@ class ScopedItemVectorCanceller { ~ScopedItemVectorCanceller() { for (DownloadManager::DownloadVector::const_iterator item = items_->begin(); item != items_->end(); ++item) { - if ((*item)->IsInProgress()) + if ((*item)->GetState() == DownloadItem::IN_PROGRESS) (*item)->Cancel(true); content::DownloadUpdatedObserver observer( (*item), base::Bind(&ItemNotInProgress)); @@ -901,7 +901,7 @@ class JustInProgressDownloadObserver }; bool ItemIsInterrupted(DownloadItem* item) { - return item->IsInterrupted(); + return item->GetState() == DownloadItem::INTERRUPTED; } } // namespace @@ -971,12 +971,12 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, // And now cancel. EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), DownloadItemIdAsArgList(download_item))); - EXPECT_TRUE(download_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, download_item->GetState()); // Cancel again. Shouldn't have any effect. EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), DownloadItemIdAsArgList(download_item))); - EXPECT_TRUE(download_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, download_item->GetState()); // Calling paused on a non-active download yields kInvalidOperationError. std::string error = RunFunctionAndReturnError( @@ -1504,9 +1504,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, EXPECT_TRUE(RunFunction(new DownloadsPauseFunction(), on_item_arg)); EXPECT_TRUE(on_item->IsPaused()); EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), on_item_arg)); - EXPECT_TRUE(on_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, on_item->GetState()); EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), on_item_arg)); - EXPECT_TRUE(on_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, on_item->GetState()); error = RunFunctionAndReturnError(new DownloadsPauseFunction(), on_item_arg); EXPECT_STREQ(download_extension_errors::kInvalidOperationError, error.c_str()); @@ -1524,9 +1524,9 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, EXPECT_TRUE(RunFunction(new DownloadsPauseFunction(), off_item_arg)); EXPECT_TRUE(off_item->IsPaused()); EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), off_item_arg)); - EXPECT_TRUE(off_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, off_item->GetState()); EXPECT_TRUE(RunFunction(new DownloadsCancelFunction(), off_item_arg)); - EXPECT_TRUE(off_item->IsCancelled()); + EXPECT_EQ(DownloadItem::CANCELLED, off_item->GetState()); error = RunFunctionAndReturnError(new DownloadsPauseFunction(), off_item_arg); EXPECT_STREQ(download_extension_errors::kInvalidOperationError, @@ -2281,7 +2281,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2347,7 +2347,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2423,7 +2423,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2487,7 +2487,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2551,7 +2551,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2616,7 +2616,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2680,7 +2680,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2744,7 +2744,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2808,7 +2808,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. Absolute paths should be rejected. std::string error; @@ -2873,7 +2873,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. Empty basenames should be rejected. std::string error; @@ -2937,7 +2937,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. std::string error; @@ -2992,7 +2992,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. // Also test that DetermineFilename allows (chrome) extensions to set @@ -3062,7 +3062,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Remove a determiner while waiting for it. RemoveFilenameDeterminer(host); @@ -3118,7 +3118,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename events. std::string error; @@ -3177,7 +3177,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. error = ""; @@ -3251,7 +3251,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename events. std::string error; @@ -3309,7 +3309,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"slow.txt\"}]", result_id))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); // Respond to the onDeterminingFilename. error = ""; @@ -3397,7 +3397,7 @@ IN_PROC_BROWSER_TEST_F( " \"filename\":\"download-unknown-size\"}]", item->GetId()))); ASSERT_TRUE(item->GetTargetFilePath().empty()); - ASSERT_TRUE(item->IsInProgress()); + ASSERT_EQ(DownloadItem::IN_PROGRESS, item->GetState()); ClearEvents(); ui_test_utils::NavigateToURLWithDisposition( |