Commit b1c9e60f authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Backport some tests in /chrome/service to SingleThreadTaskEnvironment

These tests were previously migrated from single-threaded MessageLoop to
a multi-threaded TaskEnvironment (then named ScopedTaskEnvironment) as
part of crbug.com/891670.

//base OWNERS decided in retrospect that it was better to keep a
single-threaded option for TaskEnvironment and introduced
SingleThreadTaskEnvironment. This CL retrofits that decision for
/chrome/service.

This CL is a no-op if it passes CQ.

This CL was uploaded by git cl split.

R=rbpotter@chromium.org

Bug: 891670
Change-Id: Id2b0b9a33e136e76d03363140e120a169f063054
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1786749
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarRebekah Potter <rbpotter@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693941}
parent a7a8d071
......@@ -140,8 +140,8 @@ class CloudPrintURLFetcherTest : public testing::Test,
// we assume that the current thread is the IO thread where the URLFetcher
// dispatches its requests to. When we wish to simulate being used from
// a UI thread, we dispatch a worker thread to do so.
base::test::TaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::IO};
base::test::SingleThreadTaskEnvironment task_environment_{
base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
int max_retries_;
Time start_time_;
......
......@@ -72,7 +72,7 @@ class ConnectorSettingsTest : public testing::Test {
}
base::ScopedTempDir temp_dir_;
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
};
......
......@@ -464,8 +464,8 @@ class PrinterJobHandlerTest : public ::testing::Test {
void BeginTest(int timeout_seconds);
void MakeJobFetchReturnNoJobs();
base::test::TaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::IO};
base::test::SingleThreadTaskEnvironment task_environment_{
base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::OnceClosure active_run_loop_quit_closure_;
TestURLFetcherCallback url_callback_;
MockPrinterJobHandlerDelegate jobhandler_delegate_;
......
......@@ -78,8 +78,8 @@ class ServiceIPCServerTest : public ::testing::Test {
protected:
FakeServiceIPCServerClient service_process_client_;
base::test::TaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::UI};
base::test::SingleThreadTaskEnvironment task_environment_{
base::test::SingleThreadTaskEnvironment::MainThreadType::UI};
base::Thread io_thread_;
base::WaitableEvent shutdown_event_;
std::unique_ptr<ServiceIPCServer> server_;
......
......@@ -27,7 +27,7 @@ class ServiceProcessPrefsTest : public testing::Test {
// The path to temporary directory used to contain the test operations.
base::ScopedTempDir temp_dir_;
base::test::TaskEnvironment task_environment_;
base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<ServiceProcessPrefs> prefs_;
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment