| Index: net/base/directory_lister.cc
|
| diff --git a/net/base/directory_lister.cc b/net/base/directory_lister.cc
|
| index 51cbd12dcc4fb98c168c7e4d71f0ed4aa6f008c9..6ee49f86218efc12290484c37b1bb2d47caa370e 100644
|
| --- a/net/base/directory_lister.cc
|
| +++ b/net/base/directory_lister.cc
|
| @@ -87,7 +87,7 @@ void DirectoryLister::Start() {
|
| }
|
|
|
| void DirectoryLister::Cancel() {
|
| - core_->CancelOnOriginThread();
|
| + core_->CancelOnOriginSequence();
|
| }
|
|
|
| DirectoryLister::Core::Core(const base::FilePath& dir,
|
| @@ -103,8 +103,8 @@ DirectoryLister::Core::Core(const base::FilePath& dir,
|
|
|
| DirectoryLister::Core::~Core() {}
|
|
|
| -void DirectoryLister::Core::CancelOnOriginThread() {
|
| - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
|
| +void DirectoryLister::Core::CancelOnOriginSequence() {
|
| + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| base::subtle::NoBarrier_Store(&cancelled_, 1);
|
| // Core must not call into |lister_| after cancellation, as the |lister_| may
|
| @@ -118,7 +118,7 @@ void DirectoryLister::Core::Start() {
|
|
|
| if (!base::DirectoryExists(dir_)) {
|
| origin_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&Core::DoneOnOriginThread, this,
|
| + FROM_HERE, base::Bind(&Core::DoneOnOriginSequence, this,
|
| base::Passed(std::move(directory_list)),
|
| ERR_FILE_NOT_FOUND));
|
| return;
|
| @@ -137,7 +137,7 @@ void DirectoryLister::Core::Start() {
|
| base::FilePath path;
|
| while (!(path = file_enum.Next()).empty()) {
|
| // Abort on cancellation. This is purely for performance reasons.
|
| - // Correctness guarantees are made by checks in DoneOnOriginThread.
|
| + // Correctness guarantees are made by checks in DoneOnOriginSequence.
|
| if (IsCancelled())
|
| return;
|
|
|
| @@ -165,7 +165,7 @@ void DirectoryLister::Core::Start() {
|
| SortData(directory_list.get(), type_);
|
|
|
| origin_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&Core::DoneOnOriginThread, this,
|
| + FROM_HERE, base::Bind(&Core::DoneOnOriginSequence, this,
|
| base::Passed(std::move(directory_list)), OK));
|
| }
|
|
|
| @@ -173,10 +173,10 @@ bool DirectoryLister::Core::IsCancelled() const {
|
| return !!base::subtle::NoBarrier_Load(&cancelled_);
|
| }
|
|
|
| -void DirectoryLister::Core::DoneOnOriginThread(
|
| +void DirectoryLister::Core::DoneOnOriginSequence(
|
| std::unique_ptr<DirectoryList> directory_list,
|
| int error) const {
|
| - DCHECK(origin_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(origin_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // Need to check if the operation was before first callback.
|
| if (IsCancelled())
|
|
|