| 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& hash_state, |
| 117 InterruptReason reason) { | 118 InterruptReason reason) { |
| 118 download_manager_->OnDownloadInterrupted(download_id, size, reason); | 119 download_manager_->OnDownloadInterrupted(download_id, size, |
| 120 hash_state, 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 return download_manager_->GetActiveDownload(id); | 125 return download_manager_->GetActiveDownload(id); |
| 124 } | 126 } |
| 125 | 127 |
| 126 protected: | 128 protected: |
| 127 DownloadStatusUpdater download_status_updater_; | 129 DownloadStatusUpdater download_status_updater_; |
| 128 scoped_ptr<TestingProfile> profile_; | 130 scoped_ptr<TestingProfile> profile_; |
| (...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 | 488 |
| 487 download_file->AppendDataToFile(kTestData, kTestDataLen); | 489 download_file->AppendDataToFile(kTestData, kTestDataLen); |
| 488 | 490 |
| 489 ContinueDownloadWithPath(download, new_path); | 491 ContinueDownloadWithPath(download, new_path); |
| 490 message_loop_.RunAllPending(); | 492 message_loop_.RunAllPending(); |
| 491 EXPECT_EQ(1, | 493 EXPECT_EQ(1, |
| 492 recorder.Count(MockDownloadFile::StatisticsRecorder::STAT_RENAME)); | 494 recorder.Count(MockDownloadFile::StatisticsRecorder::STAT_RENAME)); |
| 493 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); | 495 EXPECT_TRUE(GetActiveDownloadItem(0) != NULL); |
| 494 | 496 |
| 495 int64 error_size = 3; | 497 int64 error_size = 3; |
| 496 OnDownloadInterrupted(0, error_size, | 498 OnDownloadInterrupted(0, error_size, "", |
| 497 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); | 499 DOWNLOAD_INTERRUPT_REASON_FILE_ACCESS_DENIED); |
| 498 message_loop_.RunAllPending(); | 500 message_loop_.RunAllPending(); |
| 499 | 501 |
| 500 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); | 502 EXPECT_TRUE(GetActiveDownloadItem(0) == NULL); |
| 501 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); | 503 EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS)); |
| 502 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); | 504 EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED)); |
| 503 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); | 505 EXPECT_FALSE(observer->hit_state(DownloadItem::COMPLETE)); |
| 504 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); | 506 EXPECT_FALSE(observer->hit_state(DownloadItem::CANCELLED)); |
| 505 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 507 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 506 EXPECT_TRUE(observer->was_updated()); | 508 EXPECT_TRUE(observer->was_updated()); |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 858 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
| 857 EXPECT_TRUE(observer->was_updated()); | 859 EXPECT_TRUE(observer->was_updated()); |
| 858 EXPECT_FALSE(observer->was_opened()); | 860 EXPECT_FALSE(observer->was_opened()); |
| 859 EXPECT_TRUE(download->file_externally_removed()); | 861 EXPECT_TRUE(download->file_externally_removed()); |
| 860 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); | 862 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); |
| 861 EXPECT_EQ(download_item_model->GetStatusText(), | 863 EXPECT_EQ(download_item_model->GetStatusText(), |
| 862 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); | 864 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); |
| 863 | 865 |
| 864 EXPECT_FALSE(file_util::PathExists(new_path)); | 866 EXPECT_FALSE(file_util::PathExists(new_path)); |
| 865 } | 867 } |
| OLD | NEW |