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/file_util.h" | 8 #include "base/file_util.h" |
9 #include "base/i18n/number_formatting.h" | 9 #include "base/i18n/number_formatting.h" |
10 #include "base/i18n/rtl.h" | 10 #include "base/i18n/rtl.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "base/string16.h" |
13 #include "base/string_util.h" | 14 #include "base/string_util.h" |
14 #include "base/string16.h" | |
15 #include "base/utf_string_conversions.h" | 15 #include "base/utf_string_conversions.h" |
16 #include "build/build_config.h" | 16 #include "build/build_config.h" |
17 #include "chrome/browser/download/download_create_info.h" | 17 #include "chrome/browser/download/download_create_info.h" |
18 #include "chrome/browser/download/download_file.h" | 18 #include "chrome/browser/download/download_file.h" |
19 #include "chrome/browser/download/download_file_manager.h" | 19 #include "chrome/browser/download/download_file_manager.h" |
20 #include "chrome/browser/download/download_item.h" | 20 #include "chrome/browser/download/download_item.h" |
21 #include "chrome/browser/download/download_item_model.h" | 21 #include "chrome/browser/download/download_item_model.h" |
22 #include "chrome/browser/download/download_manager.h" | 22 #include "chrome/browser/download/download_manager.h" |
23 #include "chrome/browser/download/download_prefs.h" | 23 #include "chrome/browser/download/download_prefs.h" |
24 #include "chrome/browser/download/download_status_updater.h" | 24 #include "chrome/browser/download/download_status_updater.h" |
(...skipping 29 matching lines...) Expand all Loading... |
54 ~DownloadManagerTest() { | 54 ~DownloadManagerTest() { |
55 download_manager_->Shutdown(); | 55 download_manager_->Shutdown(); |
56 // profile_ must outlive download_manager_, so we explicitly delete | 56 // profile_ must outlive download_manager_, so we explicitly delete |
57 // download_manager_ first. | 57 // download_manager_ first. |
58 download_manager_ = NULL; | 58 download_manager_ = NULL; |
59 profile_.reset(NULL); | 59 profile_.reset(NULL); |
60 message_loop_.RunAllPending(); | 60 message_loop_.RunAllPending(); |
61 } | 61 } |
62 | 62 |
63 void AddDownloadToFileManager(int id, DownloadFile* download_file) { | 63 void AddDownloadToFileManager(int id, DownloadFile* download_file) { |
64 file_manager()->downloads_[id] = download_file; | 64 file_manager()->downloads_[DownloadId(download_manager_.get(), id)] = |
| 65 download_file; |
65 } | 66 } |
66 | 67 |
67 void OnAllDataSaved(int32 download_id, int64 size, const std::string& hash) { | 68 void OnAllDataSaved(int32 download_id, int64 size, const std::string& hash) { |
68 download_manager_->OnAllDataSaved(download_id, size, hash); | 69 download_manager_->OnAllDataSaved(download_id, size, hash); |
69 } | 70 } |
70 | 71 |
71 void FileSelected(const FilePath& path, void* params) { | 72 void FileSelected(const FilePath& path, void* params) { |
72 download_manager_->FileSelected(path, params); | 73 download_manager_->FileSelected(path, params); |
73 } | 74 } |
74 | 75 |
(...skipping 637 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); | 713 EXPECT_FALSE(observer->hit_state(DownloadItem::REMOVING)); |
713 EXPECT_TRUE(observer->was_updated()); | 714 EXPECT_TRUE(observer->was_updated()); |
714 EXPECT_FALSE(observer->was_opened()); | 715 EXPECT_FALSE(observer->was_opened()); |
715 EXPECT_TRUE(download->file_externally_removed()); | 716 EXPECT_TRUE(download->file_externally_removed()); |
716 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); | 717 EXPECT_EQ(DownloadItem::COMPLETE, download->state()); |
717 EXPECT_EQ(download_item_model->GetStatusText(), | 718 EXPECT_EQ(download_item_model->GetStatusText(), |
718 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); | 719 l10n_util::GetStringUTF16(IDS_DOWNLOAD_STATUS_REMOVED)); |
719 | 720 |
720 EXPECT_FALSE(file_util::PathExists(new_path)); | 721 EXPECT_FALSE(file_util::PathExists(new_path)); |
721 } | 722 } |
OLD | NEW |