Commit 90781c68 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

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

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

This CL was uploaded by git cl split.

R=yhirano@chromium.org

Bug: 891670
Change-Id: I4eb4106b83976f08826467577d34c199cce6f468
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787063
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarYutaka Hirano <yhirano@chromium.org>
Commit-Queue: Yutaka Hirano <yhirano@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693622}
parent 09705334
...@@ -55,8 +55,8 @@ class ChunkedDataPipeUploadDataStreamTest : public testing::Test { ...@@ -55,8 +55,8 @@ class ChunkedDataPipeUploadDataStreamTest : public testing::Test {
} }
protected: protected:
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::IO}; base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
std::unique_ptr<TestChunkedDataPipeGetter> chunked_data_pipe_getter_; std::unique_ptr<TestChunkedDataPipeGetter> chunked_data_pipe_getter_;
std::unique_ptr<ChunkedDataPipeUploadDataStream> chunked_upload_stream_; std::unique_ptr<ChunkedDataPipeUploadDataStream> chunked_upload_stream_;
......
...@@ -91,8 +91,8 @@ class DataPipeElementReaderTest : public testing::Test { ...@@ -91,8 +91,8 @@ class DataPipeElementReaderTest : public testing::Test {
: element_reader_(nullptr, data_pipe_getter_.GetDataPipeGetterPtr()) {} : element_reader_(nullptr, data_pipe_getter_.GetDataPipeGetterPtr()) {}
protected: protected:
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::IO}; base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
PassThroughDataPipeGetter data_pipe_getter_; PassThroughDataPipeGetter data_pipe_getter_;
DataPipeElementReader element_reader_; DataPipeElementReader element_reader_;
}; };
......
...@@ -256,8 +256,8 @@ class RestrictedCookieManagerTest ...@@ -256,8 +256,8 @@ class RestrictedCookieManagerTest
return recording_client_.recorded_activity(); return recording_client_.recorded_activity();
} }
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::MainThreadType::IO}; base::test::SingleThreadTaskEnvironment::MainThreadType::IO};
net::CookieMonster cookie_monster_; net::CookieMonster cookie_monster_;
CookieSettings cookie_settings_; CookieSettings cookie_settings_;
RecordingNetworkContextClient recording_client_; RecordingNetworkContextClient recording_client_;
......
...@@ -147,8 +147,8 @@ class ThrottlingControllerTestHelper { ...@@ -147,8 +147,8 @@ class ThrottlingControllerTestHelper {
} }
private: private:
base::test::TaskEnvironment task_environment_{ base::test::SingleThreadTaskEnvironment task_environment_{
base::test::TaskEnvironment::TimeSource::MOCK_TIME}; base::test::SingleThreadTaskEnvironment::TimeSource::MOCK_TIME};
MockNetworkLayer network_layer_; MockNetworkLayer network_layer_;
TestCallback callback_; TestCallback callback_;
net::CompletionRepeatingCallback completion_callback_; net::CompletionRepeatingCallback completion_callback_;
......
...@@ -16,7 +16,7 @@ namespace { ...@@ -16,7 +16,7 @@ namespace {
class WebSocketThrottlerTest : public ::testing::Test { class WebSocketThrottlerTest : public ::testing::Test {
private: private:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
}; };
TEST(WebSocketPerProcessThrottlerTest, InitialState) { TEST(WebSocketPerProcessThrottlerTest, InitialState) {
......
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