| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <set> | 5 #include <set> |
| 6 #include <string> | 6 #include <string> |
| 7 | 7 |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/i18n/number_formatting.h" | 10 #include "base/i18n/number_formatting.h" |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 | 107 |
| 108 BrowserThread::PostTask( | 108 BrowserThread::PostTask( |
| 109 BrowserThread::FILE, FROM_HERE, | 109 BrowserThread::FILE, FROM_HERE, |
| 110 base::Bind(&DownloadFileManager::UpdateDownload, file_manager_.get(), | 110 base::Bind(&DownloadFileManager::UpdateDownload, file_manager_.get(), |
| 111 DownloadId(kValidIdDomain, id), download_buffer_)); | 111 DownloadId(kValidIdDomain, id), download_buffer_)); |
| 112 | 112 |
| 113 message_loop_.RunAllPending(); | 113 message_loop_.RunAllPending(); |
| 114 } | 114 } |
| 115 | 115 |
| 116 void OnDownloadInterrupted(int32 download_id, int64 size, | 116 void OnDownloadInterrupted(int32 download_id, int64 size, |
| 117 const std::string partial_hash, |
| 117 InterruptReason reason) { | 118 InterruptReason reason) { |
| 118 download_manager_->OnDownloadInterrupted(download_id, size, reason); | 119 download_manager_->OnDownloadInterrupted(download_id, size, |
| 120 partial_hash, reason); |
| 119 } | 121 } |
| 120 | 122 |
| 121 // Get the download item with ID |id|. | 123 // Get the download item with ID |id|. |
| 122 DownloadItem* GetActiveDownloadItem(int32 id) { | 124 DownloadItem* GetActiveDownloadItem(int32 id) { |
| 123 if (ContainsKey(download_manager_->active_downloads_, id)) | 125 if (ContainsKey(download_manager_->active_downloads_, id)) |
| 124 return download_manager_->active_downloads_[id]; | 126 return download_manager_->active_downloads_[id]; |
| 125 return NULL; | 127 return NULL; |
| 126 } | 128 } |
| 127 | 129 |
| 128 protected: | 130 protected: |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 EXPECT_EQ(DownloadItem::IN_PROGRESS, download->state()); | 517 EXPECT_EQ(DownloadItem::IN_PROGRESS, download->state()); |
| 516 scoped_ptr<ItemObserver> observer(new ItemObserver(download)); | 518 scoped_ptr<ItemObserver> observer(new ItemObserver(download)); |
| 517 | 519 |
| 518 download_file->AppendDataToFile(kTestData, kTestDataLen); | 520 download_file->AppendDataToFile(kTestData, kTestDataLen); |
| 519 | 521 |
| 520 ContinueDownloadWithPath(download, new_path); | 522 ContinueDownloadWithPath(download, new_path); |
| 521 message_loop_.RunAllPending(); | 523 message_loop_.RunAllPending(); |
| 522 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); | 524 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); |
| 523 | 525 |
| 524 int64 error_size = 3; | 526 int64 error_size = 3; |
| 525 OnDownloadInterrupted(0, error_size, | 527 OnDownloadInterrupted(0, error_size, "", |
| 526 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); | 528 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); |
| 527 message_loop_.RunAllPending(); | 529 message_loop_.RunAllPending(); |
| 528 | 530 |
| 529 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); | 531 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); |
| 530 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); | 532 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); |
| 531 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); | 533 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); |
| 532 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); | 534 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); |
| 533 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); | 535 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); |
| 534 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 536 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 535 EXPECT_TRUE(observer->was_updated()); | 537 EXPECT_TRUE(observer->was_updated()); |
| (...skipping 348 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 884 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 886 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 885 EXPECT_TRUE(observer->was_updated()); | 887 EXPECT_TRUE(observer->was_updated()); |
| 886 EXPECT_FALSE(observer->was_opened()); | 888 EXPECT_FALSE(observer->was_opened()); |
| 887 EXPECT_TRUE(download->file_externally_removed()); | 889 EXPECT_TRUE(download->file_externally_removed()); |
| 888 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); | 890 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); |
| 889 EXPECT_EQ(download_item_model->GetStatusText(), | 891 EXPECT_EQ(download_item_model->GetStatusText(), |
| 890 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); | 892 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); |
| 891 | 893 |
| 892 EXPECT_FALSE(file_util::PathExists(new_path)); | 894 EXPECT_FALSE(file_util::PathExists(new_path)); |
| 893 } | 895 } |
| OLD | NEW |