Index: components/upload_list/upload_list.cc |
diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc |
index b08d38f0d7ef0324570159425b9bba8315f3a4b2..8db2a706ea588fabbd9a113a6a680719e5c07c37 100644 |
--- a/components/upload_list/upload_list.cc |
+++ b/components/upload_list/upload_list.cc |
@@ -11,11 +11,12 @@ |
#include "base/bind.h" |
#include "base/files/file_util.h" |
#include "base/location.h" |
+#include "base/sequenced_task_runner.h" |
#include "base/strings/string_number_conversions.h" |
#include "base/strings/string_split.h" |
#include "base/strings/string_util.h" |
-#include "base/threading/sequenced_worker_pool.h" |
-#include "base/threading/thread_task_runner_handle.h" |
+#include "base/task_runner.h" |
+#include "base/threading/sequenced_task_runner_handle.h" |
UploadList::UploadInfo::UploadInfo(const std::string& upload_id, |
const base::Time& upload_time, |
@@ -49,33 +50,31 @@ UploadList::UploadInfo::UploadInfo(const UploadInfo& upload_info) |
state(upload_info.state), |
file_size(upload_info.file_size) {} |
-UploadList::UploadInfo::~UploadInfo() {} |
+UploadList::UploadInfo::~UploadInfo() = default; |
-UploadList::UploadList( |
- Delegate* delegate, |
- const base::FilePath& upload_log_path, |
- const scoped_refptr<base::SequencedWorkerPool>& worker_pool) |
+UploadList::UploadList(Delegate* delegate, |
+ const base::FilePath& upload_log_path, |
+ scoped_refptr<base::TaskRunner> task_runner) |
: delegate_(delegate), |
upload_log_path_(upload_log_path), |
- worker_pool_(worker_pool) {} |
+ task_runner_(std::move(task_runner)) {} |
-UploadList::~UploadList() {} |
+UploadList::~UploadList() = default; |
void UploadList::LoadUploadListAsynchronously() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
- worker_pool_->PostTask( |
- FROM_HERE, |
- base::Bind(&UploadList::PerformLoadAndNotifyDelegate, |
- this, base::ThreadTaskRunnerHandle::Get())); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
+ task_runner_->PostTask( |
+ FROM_HERE, base::Bind(&UploadList::PerformLoadAndNotifyDelegate, this, |
+ base::SequencedTaskRunnerHandle::Get())); |
} |
void UploadList::ClearDelegate() { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
delegate_ = NULL; |
} |
void UploadList::PerformLoadAndNotifyDelegate( |
- const scoped_refptr<base::SequencedTaskRunner>& task_runner) { |
+ scoped_refptr<base::SequencedTaskRunner> task_runner) { |
std::vector<UploadInfo> uploads; |
LoadUploadList(&uploads); |
task_runner->PostTask( |
@@ -141,7 +140,7 @@ void UploadList::ParseLogEntries( |
} |
void UploadList::SetUploadsAndNotifyDelegate(std::vector<UploadInfo> uploads) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
uploads_ = std::move(uploads); |
if (delegate_) |
delegate_->OnUploadListAvailable(); |
@@ -149,16 +148,16 @@ void UploadList::SetUploadsAndNotifyDelegate(std::vector<UploadInfo> uploads) { |
void UploadList::GetUploads(size_t max_count, |
std::vector<UploadInfo>* uploads) { |
- DCHECK(thread_checker_.CalledOnValidThread()); |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
std::copy(uploads_.begin(), |
uploads_.begin() + std::min(uploads_.size(), max_count), |
std::back_inserter(*uploads)); |
} |
void UploadList::RequestSingleCrashUploadAsync(const std::string& local_id) { |
+ DCHECK(sequence_checker_.CalledOnValidSequence()); |
#if defined(OS_WIN) || defined(OS_MACOSX) |
- DCHECK(thread_checker_.CalledOnValidThread()); |
- worker_pool_->PostTask( |
+ task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&UploadList::RequestSingleCrashUpload, this, local_id)); |
#endif |