| 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 <string> | 5 #include <string> |
| 6 #include <set> | 6 #include <set> |
| 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 99 | 99 |
| 100 BrowserThread::PostTask( | 100 BrowserThread::PostTask( |
| 101 BrowserThread::FILE, FROM_HERE, | 101 BrowserThread::FILE, FROM_HERE, |
| 102 base::Bind(&DownloadFileManager::UpdateDownload, file_manager_.get(), | 102 base::Bind(&DownloadFileManager::UpdateDownload, file_manager_.get(), |
| 103 DownloadId(download_manager_.get(), id), download_buffer_)); | 103 DownloadId(download_manager_.get(), id), download_buffer_)); |
| 104 | 104 |
| 105 message_loop_.RunAllPending(); | 105 message_loop_.RunAllPending(); |
| 106 } | 106 } |
| 107 | 107 |
| 108 void OnDownloadInterrupted(int32 download_id, int64 size, | 108 void OnDownloadInterrupted(int32 download_id, int64 size, |
| 109 const std::string partial_hash, |
| 109 InterruptReason reason) { | 110 InterruptReason reason) { |
| 110 download_manager_->OnDownloadInterrupted(download_id, size, reason); | 111 download_manager_->OnDownloadInterrupted(download_id, size, |
| 112 partial_hash, reason); |
| 111 } | 113 } |
| 112 | 114 |
| 113 // Get the download item with ID |id|. | 115 // Get the download item with ID |id|. |
| 114 DownloadItem* GetActiveDownloadItem(int32 id) { | 116 DownloadItem* GetActiveDownloadItem(int32 id) { |
| 115 if (ContainsKey(download_manager_->active_downloads_, id)) | 117 if (ContainsKey(download_manager_->active_downloads_, id)) |
| 116 return download_manager_->active_downloads_[id]; | 118 return download_manager_->active_downloads_[id]; |
| 117 return NULL; | 119 return NULL; |
| 118 } | 120 } |
| 119 | 121 |
| 120 protected: | 122 protected: |
| (...skipping 385 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 EXPECT_EQ(DownloadItem::IN_PROGRESS, download->state()); | 508 EXPECT_EQ(DownloadItem::IN_PROGRESS, download->state()); |
| 507 scoped_ptr<ItemObserver> observer(new ItemObserver(download)); | 509 scoped_ptr<ItemObserver> observer(new ItemObserver(download)); |
| 508 | 510 |
| 509 download_file->AppendDataToFile(kTestData, kTestDataLen); | 511 download_file->AppendDataToFile(kTestData, kTestDataLen); |
| 510 | 512 |
| 511 ContinueDownloadWithPath(download, new_path); | 513 ContinueDownloadWithPath(download, new_path); |
| 512 message_loop_.RunAllPending(); | 514 message_loop_.RunAllPending(); |
| 513 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); | 515 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); |
| 514 | 516 |
| 515 int64 error_size = 3; | 517 int64 error_size = 3; |
| 516 OnDownloadInterrupted(0, error_size, | 518 OnDownloadInterrupted(0, error_size, "", |
| 517 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); | 519 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); |
| 518 message_loop_.RunAllPending(); | 520 message_loop_.RunAllPending(); |
| 519 | 521 |
| 520 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); | 522 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); |
| 521 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); | 523 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); |
| 522 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); | 524 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); |
| 523 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); | 525 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); |
| 524 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); | 526 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); |
| 525 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 527 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 526 EXPECT_TRUE(observer->was_updated()); | 528 EXPECT_TRUE(observer->was_updated()); |
| (...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 873 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 875 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 874 EXPECT_TRUE(observer->was_updated()); | 876 EXPECT_TRUE(observer->was_updated()); |
| 875 EXPECT_FALSE(observer->was_opened()); | 877 EXPECT_FALSE(observer->was_opened()); |
| 876 EXPECT_TRUE(download->file_externally_removed()); | 878 EXPECT_TRUE(download->file_externally_removed()); |
| 877 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); | 879 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); |
| 878 EXPECT_EQ(download_item_model->GetStatusText(), | 880 EXPECT_EQ(download_item_model->GetStatusText(), |
| 879 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); | 881 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); |
| 880 | 882 |
| 881 EXPECT_FALSE(file_util::PathExists(new_path)); | 883 EXPECT_FALSE(file_util::PathExists(new_path)); |
| 882 } | 884 } |
| OLD | NEW |