Commit 6d478a79 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Backport some tests in /fuchsia 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
/fuchsia.

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

This CL was uploaded by git cl split.

R=wez@chromium.org

Bug: 891670
Change-Id: Ie88dc27610fefddf8ed30f392f4b7747573cb52b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787104
Commit-Queue: Gabriel Charette <gab@chromium.org>
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarWez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694554}
parent 4f89b9e5
...@@ -100,9 +100,8 @@ class AgentImplTest : public ::testing::Test { ...@@ -100,9 +100,8 @@ class AgentImplTest : public ::testing::Test {
return nullptr; return nullptr;
} }
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::test::TaskEnvironment::MainThreadType::IO};
sys::OutgoingDirectory services_; sys::OutgoingDirectory services_;
std::unique_ptr<base::fuchsia::ServiceDirectoryClient> services_client_; std::unique_ptr<base::fuchsia::ServiceDirectoryClient> services_client_;
......
...@@ -46,9 +46,8 @@ constexpr char kUrl[] = "chrome://:emorhc"; ...@@ -46,9 +46,8 @@ constexpr char kUrl[] = "chrome://:emorhc";
constexpr char kTitle[] = "Palindrome"; constexpr char kTitle[] = "Palindrome";
MULTIPROCESS_TEST_MAIN(SpawnContextServer) { MULTIPROCESS_TEST_MAIN(SpawnContextServer) {
base::test::TaskEnvironment task_environment( base::test::SingleThreadTaskEnvironment task_environment(
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO);
base::test::TaskEnvironment::MainThreadType::IO);
base::FilePath data_dir; base::FilePath data_dir;
CHECK(base::PathService::Get(base::DIR_APP_DATA, &data_dir)); CHECK(base::PathService::Get(base::DIR_APP_DATA, &data_dir));
...@@ -179,9 +178,8 @@ class ContextProviderImplTest : public base::MultiProcessTest { ...@@ -179,9 +178,8 @@ class ContextProviderImplTest : public base::MultiProcessTest {
} }
protected: protected:
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<ContextProviderImpl> provider_; std::unique_ptr<ContextProviderImpl> provider_;
fuchsia::web::ContextProviderPtr provider_ptr_; fuchsia::web::ContextProviderPtr provider_ptr_;
fidl::BindingSet<fuchsia::web::ContextProvider> bindings_; fidl::BindingSet<fuchsia::web::ContextProvider> bindings_;
......
...@@ -96,9 +96,8 @@ class WebEngineDebugIntegrationTest : public testing::Test { ...@@ -96,9 +96,8 @@ class WebEngineDebugIntegrationTest : public testing::Test {
fuchsia::web::ContextError::REMOTE_DEBUGGING_PORT_NOT_OPENED); fuchsia::web::ContextError::REMOTE_DEBUGGING_PORT_NOT_OPENED);
} }
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::test::TaskEnvironment::MainThreadType::IO};
TestDebugListener dev_tools_listener_; TestDebugListener dev_tools_listener_;
fidl::Binding<fuchsia::web::DevToolsListener> dev_tools_listener_binding_; fidl::Binding<fuchsia::web::DevToolsListener> dev_tools_listener_binding_;
......
...@@ -250,9 +250,8 @@ class CastRunnerIntegrationTest : public testing::Test { ...@@ -250,9 +250,8 @@ class CastRunnerIntegrationTest : public testing::Test {
} }
const base::RunLoop::ScopedRunTimeoutForTest run_timeout_; const base::RunLoop::ScopedRunTimeoutForTest run_timeout_;
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::test::TaskEnvironment::MainThreadType::IO};
net::EmbeddedTestServer test_server_; net::EmbeddedTestServer test_server_;
// Returns fake Cast application information to the CastRunner. // Returns fake Cast application information to the CastRunner.
......
...@@ -87,9 +87,8 @@ class WebRunnerSmokeTest : public testing::Test { ...@@ -87,9 +87,8 @@ class WebRunnerSmokeTest : public testing::Test {
bool test_html_requested_ = false; bool test_html_requested_ = false;
bool test_image_requested_ = false; bool test_image_requested_ = false;
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY, base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
base::test::TaskEnvironment::MainThreadType::IO};
sys::OutgoingDirectory outgoing_directory_; sys::OutgoingDirectory outgoing_directory_;
std::unique_ptr<base::fuchsia::ServiceProviderImpl> service_provider_; std::unique_ptr<base::fuchsia::ServiceProviderImpl> service_provider_;
......
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