diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-20 13:40:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-01-22 12:41:23 +0000 |
| commit | 7961cea6d1041e3e454dae6a1da660b453efd238 (patch) | |
| tree | c0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/net/socket/socks_connect_job_unittest.cc | |
| parent | b7034d0803538058e5c9d904ef03cf5eab34f6ef (diff) | |
| download | qtwebengine-chromium-7961cea6d1041e3e454dae6a1da660b453efd238.tar.gz | |
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/socket/socks_connect_job_unittest.cc')
| -rw-r--r-- | chromium/net/socket/socks_connect_job_unittest.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chromium/net/socket/socks_connect_job_unittest.cc b/chromium/net/socket/socks_connect_job_unittest.cc index a9bfede63f0..53ca3ba4bd3 100644 --- a/chromium/net/socket/socks_connect_job_unittest.cc +++ b/chromium/net/socket/socks_connect_job_unittest.cc @@ -7,7 +7,7 @@ #include "base/callback.h" #include "base/containers/span.h" #include "base/run_loop.h" -#include "base/test/scoped_task_environment.h" +#include "base/test/task_environment.h" #include "base/time/time.h" #include "build/build_config.h" #include "net/base/load_states.h" @@ -24,7 +24,7 @@ #include "net/socket/socks_connect_job.h" #include "net/socket/transport_connect_job.h" #include "net/test/gtest_util.h" -#include "net/test/test_with_scoped_task_environment.h" +#include "net/test/test_with_task_environment.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -37,8 +37,7 @@ const int kProxyPort = 4321; constexpr base::TimeDelta kTinyTime = base::TimeDelta::FromMicroseconds(1); -class SOCKSConnectJobTest : public testing::Test, - public WithScopedTaskEnvironment { +class SOCKSConnectJobTest : public testing::Test, public WithTaskEnvironment { public: enum class SOCKSVersion { V4, @@ -46,8 +45,7 @@ class SOCKSConnectJobTest : public testing::Test, }; SOCKSConnectJobTest() - : WithScopedTaskEnvironment( - base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME_AND_NOW), + : WithTaskEnvironment(base::test::TaskEnvironment::TimeSource::MOCK_TIME), common_connect_job_params_( &client_socket_factory_, &host_resolver_, |