Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(659)

Unified Diff: net/base/directory_lister_unittest.cc

Issue 2682523002: Use TaskScheduler in directory_lister.cc. (Closed)
Patch Set: remove ScopedTaskScheduler from TokenBindingURLRequestTest Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/directory_lister.cc ('k') | net/url_request/url_request_file_dir_job.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/directory_lister_unittest.cc
diff --git a/net/base/directory_lister_unittest.cc b/net/base/directory_lister_unittest.cc
index 64dda72b74c5a6cdc2ea7d74b04202e9cc5688d8..277977f82c9a94ae957d6fba7418d8d362524ca2 100644
--- a/net/base/directory_lister_unittest.cc
+++ b/net/base/directory_lister_unittest.cc
@@ -11,9 +11,10 @@
#include "base/files/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/i18n/file_util_icu.h"
+#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
-#include "base/threading/thread_task_runner_handle.h"
+#include "base/test/scoped_task_scheduler.h"
#include "net/base/directory_lister.h"
#include "net/base/net_errors.h"
#include "net/test/gtest_util.h"
@@ -102,7 +103,7 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate {
void Run(DirectoryLister* lister) {
lister_ = lister;
- lister_->Start(base::ThreadTaskRunnerHandle::Get().get());
+ lister_->Start();
run_loop.Run();
}
@@ -134,9 +135,9 @@ class ListerDelegate : public DirectoryLister::DirectoryListerDelegate {
class DirectoryListerTest : public PlatformTest {
public:
DirectoryListerTest()
- : total_created_file_system_objects_in_temp_root_dir_(0),
- created_file_system_objects_in_temp_root_dir_(0) {
- }
+ : scoped_task_scheduler_(base::MessageLoop::current()),
+ total_created_file_system_objects_in_temp_root_dir_(0),
+ created_file_system_objects_in_temp_root_dir_(0) {}
void SetUp() override {
// Randomly create a directory structure of depth 3 in a temporary root
@@ -186,6 +187,8 @@ class DirectoryListerTest : public PlatformTest {
}
private:
+ base::test::ScopedTaskScheduler scoped_task_scheduler_;
+
// Number of files and directories created in SetUp, excluding
// |temp_root_dir_| itself. Includes all nested directories and their files.
int total_created_file_system_objects_in_temp_root_dir_;
@@ -239,7 +242,7 @@ TEST_F(DirectoryListerTest, BasicCancelTest) {
ListerDelegate delegate(DirectoryLister::ALPHA_DIRS_FIRST);
std::unique_ptr<DirectoryLister> lister(
new DirectoryLister(root_path(), &delegate));
- lister->Start(base::ThreadTaskRunnerHandle::Get().get());
+ lister->Start();
lister->Cancel();
base::RunLoop().RunUntilIdle();
« no previous file with comments | « net/base/directory_lister.cc ('k') | net/url_request/url_request_file_dir_job.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698