[TaskEnvironment] Mass-migrate away from ScopedTaskEnvironment
(second half of
https://chromium-review.googlesource.com/c/chromium/src/+/1756247)
This is step #1 of the mass migration. Some of these will be
backported to SingleThreadTaskEnvironment in a later phase.
scoped_task_environment.h will also only move in a follow-up CL.
TBR=dcheng@chromium.org
Bug: 992483
Change-Id: Ie80f083eeeb209180ab3c2884f1b566f73549cc6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1756248
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#688142}
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 24f49ad..3ffb1e9 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -714,7 +714,7 @@
'base::ScopedMockTimeMessageLoopTaskRunner',
(
'ScopedMockTimeMessageLoopTaskRunner is deprecated. Prefer',
- 'ScopedTaskEnvironment::TimeSource::MOCK_TIME. There are still a',
+ 'TaskEnvironment::TimeSource::MOCK_TIME. There are still a',
'few cases that may require a ScopedMockTimeMessageLoopTaskRunner',
'(i.e. mocking the main MessageLoopForUI in browser_tests), but check',
'with gab@ first if you think you need it)',
diff --git a/android_webview/browser/aw_content_browser_client_unittest.cc b/android_webview/browser/aw_content_browser_client_unittest.cc
index 925a6260..96e05630 100644
--- a/android_webview/browser/aw_content_browser_client_unittest.cc
+++ b/android_webview/browser/aw_content_browser_client_unittest.cc
@@ -17,7 +17,7 @@
mojo::core::Init();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(AwContentBrowserClientTest, DisableCreatingThreadPool) {
diff --git a/android_webview/browser/aw_form_database_service_unittest.cc b/android_webview/browser/aw_form_database_service_unittest.cc
index f31e02d..a6ba28d 100644
--- a/android_webview/browser/aw_form_database_service_unittest.cc
+++ b/android_webview/browser/aw_form_database_service_unittest.cc
@@ -37,11 +37,11 @@
void TearDown() override {
service_->Shutdown();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// The path to the temporary directory used for the test operations.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
JNIEnv* env_;
std::unique_ptr<AwFormDatabaseService> service_;
diff --git a/android_webview/browser/aw_metrics_service_client_unittest.cc b/android_webview/browser/aw_metrics_service_client_unittest.cc
index 0066f92..71c2c498 100644
--- a/android_webview/browser/aw_metrics_service_client_unittest.cc
+++ b/android_webview/browser/aw_metrics_service_client_unittest.cc
@@ -65,7 +65,7 @@
~AwMetricsServiceClientTest() override {}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
DISALLOW_COPY_AND_ASSIGN(AwMetricsServiceClientTest);
diff --git a/android_webview/browser/network_service/android_stream_reader_url_loader_unittest.cc b/android_webview/browser/network_service/android_stream_reader_url_loader_unittest.cc
index f4e1245c..09ef99d 100644
--- a/android_webview/browser/network_service/android_stream_reader_url_loader_unittest.cc
+++ b/android_webview/browser/network_service/android_stream_reader_url_loader_unittest.cc
@@ -233,7 +233,7 @@
return std::string(buffer.data(), buffer.size());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(AndroidStreamReaderURLLoaderTest);
};
diff --git a/android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager_unittest.cc b/android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager_unittest.cc
index e391e9b..0eda07a 100644
--- a/android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager_unittest.cc
+++ b/android_webview/browser/safe_browsing/aw_safe_browsing_whitelist_manager_unittest.cc
@@ -30,8 +30,8 @@
void SetWhitelist(std::vector<std::string>&& whitelist, bool expected);
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<AwSafeBrowsingWhitelistManager> wm_;
};
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/memory_metrics_logger_test.cc b/android_webview/javatests/src/org/chromium/android_webview/test/memory_metrics_logger_test.cc
index 2ccd315..16ab49b 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/memory_metrics_logger_test.cc
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/memory_metrics_logger_test.cc
@@ -19,8 +19,8 @@
return false;
TestTimeouts::Initialize();
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY);
base::RunLoop run_loop;
bool result = false;
memory_metrics_logger->ScheduleRecordForTesting(
diff --git a/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc b/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc
index 8d36730..d0b48d7 100644
--- a/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc
+++ b/base/util/memory_pressure/multi_source_memory_pressure_monitor_unittest.cc
@@ -12,7 +12,7 @@
namespace util {
TEST(MultiSourceMemoryPressureMonitorTest, RunDispatchCallback) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
MultiSourceMemoryPressureMonitor monitor;
auto* aggregator = monitor.aggregator_for_testing();
diff --git a/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc b/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc
index d23d296..0289861 100644
--- a/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc
+++ b/chrome/browser/notifications/scheduler/internal/icon_converter_unittest.cc
@@ -49,7 +49,7 @@
std::vector<std::string>* encoded_data() { return &encoded_data_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<IconConverter> icon_converter_;
std::vector<std::string> encoded_data_;
std::vector<SkBitmap> decoded_icons_;
diff --git a/chrome/browser/ui/views/layout/animating_layout_manager_unittest.cc b/chrome/browser/ui/views/layout/animating_layout_manager_unittest.cc
index 07fa22b..6c9c356 100644
--- a/chrome/browser/ui/views/layout/animating_layout_manager_unittest.cc
+++ b/chrome/browser/ui/views/layout/animating_layout_manager_unittest.cc
@@ -139,7 +139,7 @@
View* view_;
std::vector<View*> children_;
AnimatingLayoutManager* animating_layout_manager_ = nullptr;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<gfx::AnimationContainerTestApi> container_test_api_;
};
diff --git a/components/arc/power/arc_power_bridge_unittest.cc b/components/arc/power/arc_power_bridge_unittest.cc
index 1069971..ee4a856 100644
--- a/components/arc/power/arc_power_bridge_unittest.cc
+++ b/components/arc/power/arc_power_bridge_unittest.cc
@@ -103,7 +103,7 @@
return chromeos::FakePowerManagerClient::Get();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory connector_factory_;
diff --git a/components/arc/session/arc_data_remover_unittest.cc b/components/arc/session/arc_data_remover_unittest.cc
index 75c4d6c..827154b 100644
--- a/components/arc/session/arc_data_remover_unittest.cc
+++ b/components/arc/session/arc_data_remover_unittest.cc
@@ -72,7 +72,7 @@
private:
TestingPrefServiceSimple prefs_;
const cryptohome::Identification cryptohome_id_{EmptyAccountId()};
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestUpstartClient> test_upstart_client_;
DISALLOW_COPY_AND_ASSIGN(ArcDataRemoverTest);
diff --git a/components/arc/session/arc_session_impl_unittest.cc b/components/arc/session/arc_session_impl_unittest.cc
index 83f7951..4fcc1f86 100644
--- a/components/arc/session/arc_session_impl_unittest.cc
+++ b/components/arc/session/arc_session_impl_unittest.cc
@@ -224,7 +224,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
user_manager::ScopedUserManager scoped_user_manager_{
std::make_unique<user_manager::FakeUserManager>()};
diff --git a/components/arc/session/arc_session_runner_unittest.cc b/components/arc/session/arc_session_runner_unittest.cc
index dcea0d3..e3c8659 100644
--- a/components/arc/session/arc_session_runner_unittest.cc
+++ b/components/arc/session/arc_session_runner_unittest.cc
@@ -56,8 +56,7 @@
public ArcSessionRunner::Observer {
public:
ArcSessionRunnerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
chromeos::SessionManagerClient::InitializeFakeInMemory();
@@ -137,7 +136,7 @@
bool stopped_called_;
bool restarting_called_;
std::unique_ptr<ArcSessionRunner> arc_session_runner_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ArcSessionRunnerTest);
};
diff --git a/components/arc/wake_lock/arc_wake_lock_bridge_unittest.cc b/components/arc/wake_lock/arc_wake_lock_bridge_unittest.cc
index af2e3c1..1528547 100644
--- a/components/arc/wake_lock/arc_wake_lock_bridge_unittest.cc
+++ b/components/arc/wake_lock/arc_wake_lock_bridge_unittest.cc
@@ -27,8 +27,7 @@
class ArcWakeLockBridgeTest : public testing::Test {
public:
ArcWakeLockBridgeTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
wake_lock_provider_(
connector_factory_.RegisterInstance(device::mojom::kServiceName)) {
bridge_service_ = std::make_unique<ArcBridgeService>();
@@ -98,7 +97,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory connector_factory_;
device::TestWakeLockProvider wake_lock_provider_;
diff --git a/components/assist_ranker/base_predictor_unittest.cc b/components/assist_ranker/base_predictor_unittest.cc
index 9339229b..2886785 100644
--- a/components/assist_ranker/base_predictor_unittest.cc
+++ b/components/assist_ranker/base_predictor_unittest.cc
@@ -113,7 +113,7 @@
private:
// Sets up the task scheduling/task-runner environment for each test.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Sets itself as the global UkmRecorder on construction.
ukm::TestAutoSetUkmRecorder test_ukm_recorder_;
diff --git a/components/assist_ranker/ranker_model_loader_impl_unittest.cc b/components/assist_ranker/ranker_model_loader_impl_unittest.cc
index c8476fe..dd8f4110 100644
--- a/components/assist_ranker/ranker_model_loader_impl_unittest.cc
+++ b/components/assist_ranker/ranker_model_loader_impl_unittest.cc
@@ -76,7 +76,7 @@
void OnModelAvailable(std::unique_ptr<RankerModel> model);
// Sets up the task scheduling/task-runner environment for each test.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Override the default URL loader to return custom responses for tests.
network::TestURLLoaderFactory test_loader_factory_;
@@ -175,7 +175,7 @@
test_shared_loader_factory_, model_path, model_url,
"RankerModelLoaderImplTest");
loader->NotifyOfRankerActivity();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return true;
}
diff --git a/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc b/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
index 88f3bd8..52dcf93 100644
--- a/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
+++ b/components/autofill/content/renderer/renderer_save_password_progress_logger_unittest.cc
@@ -102,7 +102,7 @@
} // namespace
TEST(RendererSavePasswordProgressLoggerTest, SendLog) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
FakeContentPasswordManagerDriver fake_driver;
mojom::PasswordManagerDriverPtr driver_ptr =
fake_driver.CreateInterfacePtrAndBind();
diff --git a/components/autofill/core/browser/address_normalizer_impl_unittest.cc b/components/autofill/core/browser/address_normalizer_impl_unittest.cc
index 37f0a97..df119d3 100644
--- a/components/autofill/core/browser/address_normalizer_impl_unittest.cc
+++ b/components/autofill/core/browser/address_normalizer_impl_unittest.cc
@@ -94,7 +94,7 @@
~AddressNormalizerTest() override {}
void WaitForAddressValidatorInitialization() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
bool normalization_successful() const { return success_; }
@@ -103,7 +103,7 @@
TestAddressNormalizer* normalizer() { return &normalizer_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool AreRulesLoadedForRegion(const std::string& region_code) {
return normalizer_.AreRulesLoadedForRegion(region_code);
@@ -187,7 +187,7 @@
base::Unretained(this)));
// Let the timeout execute.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Since the rules are never loaded and the timeout is 0, the callback should
// get notified that the address could not be normalized.
@@ -338,7 +338,7 @@
base::Unretained(this)));
// Let the timeout execute.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Make sure the address was not normalized.
EXPECT_FALSE(normalization_successful());
diff --git a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
index d47ec4f7..f1f1ae4b 100644
--- a/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
+++ b/components/autofill/core/browser/autocomplete_history_manager_unittest.cc
@@ -150,7 +150,7 @@
date_last_used);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockWebDataService> web_data_service_;
std::unique_ptr<AutocompleteHistoryManager> autocomplete_manager_;
std::unique_ptr<PrefService> prefs_;
diff --git a/components/autofill/core/browser/autofill_assistant_unittest.cc b/components/autofill/core/browser/autofill_assistant_unittest.cc
index 6c7d46e..aa28265 100644
--- a/components/autofill/core/browser/autofill_assistant_unittest.cc
+++ b/components/autofill/core/browser/autofill_assistant_unittest.cc
@@ -148,7 +148,7 @@
return static_cast<CardUnmaskDelegate*>(full_card_request);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
testing::NiceMock<TestAutofillDriver> autofill_driver_;
TestPersonalDataManager pdm_;
diff --git a/components/autofill/core/browser/autofill_download_manager_unittest.cc b/components/autofill/core/browser/autofill_download_manager_unittest.cc
index 8e2de6b..7c7cd4be 100644
--- a/components/autofill/core/browser/autofill_download_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_download_manager_unittest.cc
@@ -251,7 +251,7 @@
};
ScopedActiveAutofillExperiments scoped_active_autofill_experiments;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::list<ResponseData> responses_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
network::TestURLLoaderFactory test_url_loader_factory_;
@@ -1492,8 +1492,8 @@
return succeeded;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
base::test::ScopedCommandLine scoped_command_line_;
base::test::ScopedFeatureList scoped_feature_list_1_;
base::test::ScopedFeatureList scoped_feature_list_2_;
diff --git a/components/autofill/core/browser/autofill_driver_factory_unittest.cc b/components/autofill/core/browser/autofill_driver_factory_unittest.cc
index 7e11d2a..2819151 100644
--- a/components/autofill/core/browser/autofill_driver_factory_unittest.cc
+++ b/components/autofill/core/browser/autofill_driver_factory_unittest.cc
@@ -100,7 +100,7 @@
protected:
// For TestAutofillDriver.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockAutofillClient client_;
diff --git a/components/autofill/core/browser/autofill_external_delegate_unittest.cc b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
index c9d6c18..fcd4054 100644
--- a/components/autofill/core/browser/autofill_external_delegate_unittest.cc
+++ b/components/autofill/core/browser/autofill_external_delegate_unittest.cc
@@ -181,7 +181,7 @@
kQueryId, suggestions, /*autoselect_first_suggestion=*/false);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockAutofillClient> autofill_client_;
std::unique_ptr<testing::NiceMock<MockAutofillDriver>> autofill_driver_;
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index e051f81..ce115a1 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -589,7 +589,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockAutofillClient autofill_client_;
std::unique_ptr<MockAutofillDriver> autofill_driver_;
std::unique_ptr<TestAutofillManager> autofill_manager_;
diff --git a/components/autofill/core/browser/autofill_merge_unittest.cc b/components/autofill/core/browser/autofill_merge_unittest.cc
index 2427d94..07a797b 100644
--- a/components/autofill/core/browser/autofill_merge_unittest.cc
+++ b/components/autofill/core/browser/autofill_merge_unittest.cc
@@ -183,7 +183,7 @@
// Deserializes |str| into a field type.
ServerFieldType StringToFieldType(const std::string& str);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
PersonalDataManagerMock personal_data_;
std::unique_ptr<FormDataImporter> form_data_importer_;
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index e6419b9..b359afb7 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -283,7 +283,7 @@
// Purge recorded UKM metrics for running more tests.
void PurgeUKM();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockAutofillClient autofill_client_;
ukm::TestUkmRecorder* test_ukm_recorder_;
syncer::TestSyncService sync_service_;
diff --git a/components/autofill/core/browser/autofill_profile_validator_unittest.cc b/components/autofill/core/browser/autofill_profile_validator_unittest.cc
index e2cd547c..fca0dcb 100644
--- a/components/autofill/core/browser/autofill_profile_validator_unittest.cc
+++ b/components/autofill/core/browser/autofill_profile_validator_unittest.cc
@@ -105,7 +105,7 @@
expected_validity_;
private:
- base::test::ScopedTaskEnvironment scoped_task_scheduler;
+ base::test::TaskEnvironment scoped_task_scheduler;
DISALLOW_COPY_AND_ASSIGN(AutofillProfileValidatorTest);
};
diff --git a/components/autofill/core/browser/field_filler_unittest.cc b/components/autofill/core/browser/field_filler_unittest.cc
index fbdf18c..7b579c9 100644
--- a/components/autofill/core/browser/field_filler_unittest.cc
+++ b/components/autofill/core/browser/field_filler_unittest.cc
@@ -758,14 +758,14 @@
std::unique_ptr<Storage>(new NullStorage), "en-US");
// Make sure the normalizer is done initializing its member(s) in
// background task(s).
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
protected:
AddressNormalizer* normalizer() { return normalizer_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AddressNormalizerImpl> normalizer_;
DISALLOW_COPY_AND_ASSIGN(AutofillSelectWithStatesTest);
diff --git a/components/autofill/core/browser/form_data_importer_unittest.cc b/components/autofill/core/browser/form_data_importer_unittest.cc
index a672b8a..930ded1f 100644
--- a/components/autofill/core/browser/form_data_importer_unittest.cc
+++ b/components/autofill/core/browser/form_data_importer_unittest.cc
@@ -223,8 +223,8 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<PrefService> prefs_;
scoped_refptr<AutofillWebDataService> autofill_database_service_;
scoped_refptr<WebDatabaseService> web_database_;
diff --git a/components/autofill/core/browser/geo/subkey_requester_unittest.cc b/components/autofill/core/browser/geo/subkey_requester_unittest.cc
index 4ae481a..92d1970 100644
--- a/components/autofill/core/browser/geo/subkey_requester_unittest.cc
+++ b/components/autofill/core/browser/geo/subkey_requester_unittest.cc
@@ -102,7 +102,7 @@
~SubKeyRequesterTest() override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestSubKeyRequester> requester_;
private:
@@ -157,7 +157,7 @@
requester_->StartRegionSubKeysRequest(kLocale, kLanguage, 0, std::move(cb));
// Let the timeout execute.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Since the rules are never loaded and the timeout is 0, the delegate should
// get notified that the subkeys could not be received.
diff --git a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller_unittest.cc b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller_unittest.cc
index 1730dc5..32b617d7 100644
--- a/components/autofill/core/browser/payments/autofill_wallet_data_type_controller_unittest.cc
+++ b/components/autofill/core/browser/payments/autofill_wallet_data_type_controller_unittest.cc
@@ -148,7 +148,7 @@
last_error_ = error;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple prefs_;
syncer::UserShare user_share_;
testing::NiceMock<syncer::MockSyncService> sync_service_;
diff --git a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
index b81573bd..f6925be 100644
--- a/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_access_manager_unittest.cc
@@ -141,10 +141,9 @@
class CreditCardAccessManagerTest : public testing::Test {
public:
CreditCardAccessManagerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
void SetUp() override {
autofill_client_.SetPrefs(test::PrefServiceForTesting());
@@ -283,11 +282,11 @@
credit_card_access_manager_->ready_to_start_authentication_.Signal();
}
- void WaitForCallbacks() { scoped_task_environment_.RunUntilIdle(); }
+ void WaitForCallbacks() { task_environment_.RunUntilIdle(); }
protected:
std::unique_ptr<TestAccessor> accessor_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
payments::TestPaymentsClient* payments_client_;
TestAutofillClient autofill_client_;
std::unique_ptr<TestAutofillDriver> autofill_driver_;
diff --git a/components/autofill/core/browser/payments/credit_card_cvc_authenticator_unittest.cc b/components/autofill/core/browser/payments/credit_card_cvc_authenticator_unittest.cc
index 0ff4083..66c0365 100644
--- a/components/autofill/core/browser/payments/credit_card_cvc_authenticator_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_cvc_authenticator_unittest.cc
@@ -151,7 +151,7 @@
protected:
std::unique_ptr<TestAuthenticationRequester> requester_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
std::unique_ptr<TestAutofillDriver> autofill_driver_;
scoped_refptr<AutofillWebDataService> database_;
diff --git a/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc b/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
index 311a94f..a2d744a 100644
--- a/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_fido_authenticator_unittest.cc
@@ -225,7 +225,7 @@
protected:
std::unique_ptr<TestAuthenticationRequester> requester_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
std::unique_ptr<TestAutofillDriver> autofill_driver_;
scoped_refptr<AutofillWebDataService> database_;
diff --git a/components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc b/components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc
index 9b3e87b..78fa295 100644
--- a/components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc
+++ b/components/autofill/core/browser/payments/credit_card_save_manager_unittest.cc
@@ -349,7 +349,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
std::unique_ptr<TestAutofillDriver> autofill_driver_;
std::unique_ptr<TestAutofillManager> autofill_manager_;
diff --git a/components/autofill/core/browser/payments/full_card_request_unittest.cc b/components/autofill/core/browser/payments/full_card_request_unittest.cc
index 972146b..abff621a 100644
--- a/components/autofill/core/browser/payments/full_card_request_unittest.cc
+++ b/components/autofill/core/browser/payments/full_card_request_unittest.cc
@@ -107,7 +107,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockPersonalDataManager personal_data_;
MockResultDelegate result_delegate_;
MockUIDelegate ui_delegate_;
diff --git a/components/autofill/core/browser/payments/local_card_migration_manager_unittest.cc b/components/autofill/core/browser/payments/local_card_migration_manager_unittest.cc
index 0b32e53..2e72102 100644
--- a/components/autofill/core/browser/payments/local_card_migration_manager_unittest.cc
+++ b/components/autofill/core/browser/payments/local_card_migration_manager_unittest.cc
@@ -305,7 +305,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutofillClient autofill_client_;
std::unique_ptr<TestAutofillDriver> autofill_driver_;
std::unique_ptr<TestAutofillManager> autofill_manager_;
diff --git a/components/autofill/core/browser/payments/payments_client_unittest.cc b/components/autofill/core/browser/payments/payments_client_unittest.cc
index be6d6b0..9527c121 100644
--- a/components/autofill/core/browser/payments/payments_client_unittest.cc
+++ b/components/autofill/core/browser/payments/payments_client_unittest.cc
@@ -318,7 +318,7 @@
// A tip message to be displayed during local card migration.
std::string display_text_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
TestPersonalDataManager test_personal_data_;
diff --git a/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc b/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc
index 853d0a2..ebf93403 100644
--- a/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc
+++ b/components/autofill/core/browser/payments/strike_database_integrator_test_strike_database_unittest.cc
@@ -43,12 +43,12 @@
// to a task runner, requires running the loop to complete.
strike_database_.reset();
strike_database_service_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
protected:
base::HistogramTester* GetHistogramTester() { return &histogram_tester_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<leveldb_proto::ProtoDatabaseProvider> db_provider_;
std::unique_ptr<StrikeDatabase> strike_database_service_;
diff --git a/components/autofill/core/browser/payments/strike_database_unittest.cc b/components/autofill/core/browser/payments/strike_database_unittest.cc
index f03e13c..a65a3cf 100644
--- a/components/autofill/core/browser/payments/strike_database_unittest.cc
+++ b/components/autofill/core/browser/payments/strike_database_unittest.cc
@@ -129,7 +129,7 @@
protected:
base::HistogramTester* GetHistogramTester() { return &histogram_tester_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<leveldb_proto::ProtoDatabaseProvider> db_provider_;
std::unique_ptr<TestStrikeDatabase> strike_database_;
base::ScopedTempDir temp_dir_;
diff --git a/components/autofill/core/browser/personal_data_manager_unittest.cc b/components/autofill/core/browser/personal_data_manager_unittest.cc
index 1e20f7ba..94257dc 100644
--- a/components/autofill/core/browser/personal_data_manager_unittest.cc
+++ b/components/autofill/core/browser/personal_data_manager_unittest.cc
@@ -297,8 +297,8 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<PrefService> prefs_;
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_test_env_;
diff --git a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
index cb4168f85..76b0d2a 100644
--- a/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
+++ b/components/autofill/core/browser/webdata/autocomplete_sync_bridge_unittest.cc
@@ -293,7 +293,7 @@
private:
ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockAutofillWebDataBackend> backend_;
AutofillTable table_;
WebDatabase db_;
diff --git a/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc
index fe32010..18b4248 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_sync_bridge_unittest.cc
@@ -321,7 +321,7 @@
private:
autofill::TestAutofillClock test_clock_;
ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockAutofillWebDataBackend> backend_;
AutofillTable table_;
WebDatabase db_;
diff --git a/components/autofill/core/browser/webdata/autofill_profile_sync_difference_tracker_unittest.cc b/components/autofill/core/browser/webdata/autofill_profile_sync_difference_tracker_unittest.cc
index 799ff003..e7955e7 100644
--- a/components/autofill/core/browser/webdata/autofill_profile_sync_difference_tracker_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_profile_sync_difference_tracker_unittest.cc
@@ -107,7 +107,7 @@
private:
autofill::TestAutofillClock test_clock_;
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
AutofillTable table_;
WebDatabase db_;
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc
index 70da95f..98168b6 100644
--- a/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_wallet_metadata_sync_bridge_unittest.cc
@@ -452,7 +452,7 @@
int response_version = 0;
autofill::TestAutofillClock test_clock_;
ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockAutofillWebDataBackend> backend_;
AutofillTable table_;
WebDatabase db_;
diff --git a/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc b/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc
index 19c63cf..3836ca75 100644
--- a/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_wallet_sync_bridge_unittest.cc
@@ -336,7 +336,7 @@
private:
autofill::TestAutofillClock test_clock_;
ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<MockAutofillWebDataBackend> backend_;
AutofillTable table_;
WebDatabase db_;
diff --git a/components/autofill/core/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
index 842588b..c54e023 100644
--- a/components/autofill/core/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
@@ -91,8 +91,7 @@
class WebDataServiceTest : public testing::Test {
public:
WebDataServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
protected:
void SetUp() override {
@@ -119,10 +118,10 @@
wdbs_->ShutdownDatabase();
wds_ = nullptr;
wdbs_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FilePath profile_dir_;
scoped_refptr<AutofillWebDataService> wds_;
scoped_refptr<WebDatabaseService> wdbs_;
@@ -207,7 +206,7 @@
static const int limit = 10;
handle = wds_->GetFormValuesForElementName(
name1_, base::string16(), limit, &consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(1U, consumer.result().size());
EXPECT_EQ(value1_, consumer.result()[0].key().value());
@@ -284,7 +283,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<AutofillProfile>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetAutofillProfiles(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(1U, consumer.result().size());
EXPECT_EQ(profile, *consumer.result()[0]);
@@ -303,7 +302,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<AutofillProfile>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetAutofillProfiles(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(1U, consumer.result().size());
EXPECT_EQ(profile, *consumer.result()[0]);
@@ -322,7 +321,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<AutofillProfile>>>
consumer2;
WebDataServiceBase::Handle handle2 = wds_->GetAutofillProfiles(&consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, consumer2.handle());
ASSERT_EQ(0U, consumer2.result().size());
}
@@ -348,7 +347,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<AutofillProfile>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetAutofillProfiles(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(2U, consumer.result().size());
EXPECT_EQ(profile2, *consumer.result()[0]);
@@ -370,7 +369,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<AutofillProfile>>>
consumer2;
WebDataServiceBase::Handle handle2 = wds_->GetAutofillProfiles(&consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, consumer2.handle());
ASSERT_EQ(2U, consumer2.result().size());
EXPECT_EQ(profile2_changed, *consumer2.result()[0]);
@@ -386,7 +385,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetCreditCards(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(1U, consumer.result().size());
EXPECT_EQ(card, *consumer.result()[0]);
@@ -402,7 +401,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetCreditCards(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(1U, consumer.result().size());
EXPECT_EQ(credit_card, *consumer.result()[0]);
@@ -414,7 +413,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
consumer2;
WebDataServiceBase::Handle handle2 = wds_->GetCreditCards(&consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, consumer2.handle());
ASSERT_EQ(0U, consumer2.result().size());
}
@@ -432,7 +431,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
consumer;
WebDataServiceBase::Handle handle = wds_->GetCreditCards(&consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, consumer.handle());
ASSERT_EQ(2U, consumer.result().size());
EXPECT_EQ(card2, *consumer.result()[0]);
@@ -447,7 +446,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
consumer2;
WebDataServiceBase::Handle handle2 = wds_->GetCreditCards(&consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, consumer2.handle());
ASSERT_EQ(2U, consumer2.result().size());
EXPECT_NE(card2, *consumer2.result()[0]);
@@ -468,7 +467,7 @@
profile_consumer;
WebDataServiceBase::Handle handle =
wds_->GetAutofillProfiles(&profile_consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, profile_consumer.handle());
ASSERT_EQ(1U, profile_consumer.result().size());
EXPECT_EQ(profile, *profile_consumer.result()[0]);
@@ -481,7 +480,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
card_consumer;
handle = wds_->GetCreditCards(&card_consumer);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle, card_consumer.handle());
ASSERT_EQ(1U, card_consumer.result().size());
EXPECT_EQ(credit_card, *card_consumer.result()[0]);
@@ -501,7 +500,7 @@
profile_consumer2;
WebDataServiceBase::Handle handle2 =
wds_->GetAutofillProfiles(&profile_consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, profile_consumer2.handle());
ASSERT_EQ(0U, profile_consumer2.result().size());
@@ -509,7 +508,7 @@
AutofillWebDataServiceConsumer<std::vector<std::unique_ptr<CreditCard>>>
card_consumer2;
handle2 = wds_->GetCreditCards(&card_consumer2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(handle2, card_consumer2.handle());
ASSERT_EQ(0U, card_consumer2.result().size());
}
diff --git a/components/autofill/core/common/mojom/autofill_types_mojom_traits_unittest.cc b/components/autofill/core/common/mojom/autofill_types_mojom_traits_unittest.cc
index 7dec3980..827be95 100644
--- a/components/autofill/core/common/mojom/autofill_types_mojom_traits_unittest.cc
+++ b/components/autofill/core/common/mojom/autofill_types_mojom_traits_unittest.cc
@@ -254,7 +254,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TypeTraitsTest> bindings_;
};
diff --git a/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc b/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc
index d33e409..52821b5 100644
--- a/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc
+++ b/components/autofill_assistant/browser/actions/configure_bottom_sheet_action_unittest.cc
@@ -29,7 +29,7 @@
class ConfigureBottomSheetActionTest : public testing::Test {
public:
ConfigureBottomSheetActionTest()
- : task_env_(base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
void SetUp() override {
ON_CALL(mock_action_delegate_, GetViewportMode())
@@ -84,7 +84,7 @@
// task_env_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
MockActionDelegate mock_action_delegate_;
MockWebController mock_web_controller_;
diff --git a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc
index 1e7d19b..f46eede 100644
--- a/components/autofill_assistant/browser/actions/prompt_action_unittest.cc
+++ b/components/autofill_assistant/browser/actions/prompt_action_unittest.cc
@@ -33,7 +33,7 @@
class PromptActionTest : public testing::Test {
public:
PromptActionTest()
- : task_env_(base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
void SetUp() override {
ON_CALL(mock_web_controller_, OnElementCheck(_, _))
@@ -56,7 +56,7 @@
protected:
// task_env_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
MockActionDelegate mock_action_delegate_;
MockWebController mock_web_controller_;
diff --git a/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc b/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc
index 467e36c..65e3ff7 100644
--- a/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc
+++ b/components/autofill_assistant/browser/actions/wait_for_document_action_unittest.cc
@@ -33,7 +33,7 @@
class WaitForDocumentActionTest : public testing::Test {
public:
WaitForDocumentActionTest()
- : task_env_(base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
void SetUp() override {
ON_CALL(mock_action_delegate_, OnWaitForDocumentReadyState(_, _, _))
@@ -61,7 +61,7 @@
protected:
// task_env_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
MockActionDelegate mock_action_delegate_;
WaitForDocumentProto proto_;
diff --git a/components/autofill_assistant/browser/controller_unittest.cc b/components/autofill_assistant/browser/controller_unittest.cc
index fbedd27..96c70d98 100644
--- a/components/autofill_assistant/browser/controller_unittest.cc
+++ b/components/autofill_assistant/browser/controller_unittest.cc
@@ -76,8 +76,8 @@
public:
ControllerTest()
: RenderViewHostTestHarness(
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
~ControllerTest() override {}
void SetUp() override {
diff --git a/components/autofill_assistant/browser/element_area_unittest.cc b/components/autofill_assistant/browser/element_area_unittest.cc
index b271af9..e25fcf3 100644
--- a/components/autofill_assistant/browser/element_area_unittest.cc
+++ b/components/autofill_assistant/browser/element_area_unittest.cc
@@ -68,8 +68,7 @@
class ElementAreaTest : public testing::Test {
protected:
ElementAreaTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
element_area_(&delegate_) {
delegate_.SetWebController(&mock_web_controller_);
delegate_.GetMutableSettings()->element_position_update_interval =
@@ -104,9 +103,9 @@
reported_restricted_area_ = restricted_area;
}
- // scoped_task_environment_ must be first to guarantee other field
+ // task_environment_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockWebController mock_web_controller_;
FakeScriptExecutorDelegate delegate_;
@@ -382,8 +381,7 @@
EXPECT_THAT(reported_area_, ElementsAre(MatchingRectF(0, 25, 100, 50)));
- scoped_task_environment_.FastForwardBy(
- base::TimeDelta::FromMilliseconds(100));
+ task_environment_.FastForwardBy(base::TimeDelta::FromMilliseconds(100));
// Updated area is available
std::vector<RectF> rectangles;
diff --git a/components/autofill_assistant/browser/retry_timer_unittest.cc b/components/autofill_assistant/browser/retry_timer_unittest.cc
index e467d15..9499104 100644
--- a/components/autofill_assistant/browser/retry_timer_unittest.cc
+++ b/components/autofill_assistant/browser/retry_timer_unittest.cc
@@ -23,11 +23,10 @@
class RetryTimerTest : public testing::Test {
protected:
RetryTimerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
void FastForwardOneSecond() {
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
}
base::RepeatingCallback<void(base::OnceCallback<void(bool)>)>
@@ -65,9 +64,9 @@
captured_callback_ = std::move(callback);
}
- // scoped_task_environment_ must be first to guarantee other field
+ // task_environment_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
int try_count_ = 0;
base::OnceCallback<void(bool)> captured_callback_;
diff --git a/components/autofill_assistant/browser/script_executor_unittest.cc b/components/autofill_assistant/browser/script_executor_unittest.cc
index 1a791ae..cd6d17a 100644
--- a/components/autofill_assistant/browser/script_executor_unittest.cc
+++ b/components/autofill_assistant/browser/script_executor_unittest.cc
@@ -76,8 +76,7 @@
protected:
ScriptExecutorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
// Implements ScriptExecutor::Listener
void OnServerPayloadChanged(const std::string& global_payload,
@@ -145,9 +144,9 @@
interrupts_.emplace_back(std::move(interrupt));
}
- // scoped_task_environment_ must be first to guarantee other field
+ // task_environment_ must be first to guarantee other field
// creation run in that environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeScriptExecutorDelegate delegate_;
Script script_;
StrictMock<MockService> mock_service_;
@@ -364,14 +363,13 @@
// executor_callback_.Run() not expected to be run just yet, as the action is
// delayed.
executor_->Run(executor_callback_.Get());
- EXPECT_TRUE(scoped_task_environment_.NextTaskIsDelayed());
+ EXPECT_TRUE(task_environment_.NextTaskIsDelayed());
// Moving forward in time triggers action execution.
EXPECT_CALL(executor_callback_,
Run(Field(&ScriptExecutor::Result::success, true)));
- scoped_task_environment_.FastForwardBy(
- base::TimeDelta::FromMilliseconds(1000));
- EXPECT_EQ(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ task_environment_.FastForwardBy(base::TimeDelta::FromMilliseconds(1000));
+ EXPECT_EQ(task_environment_.GetPendingMainThreadTaskCount(), 0u);
}
TEST_F(ScriptExecutorTest, ClearDetailsWhenFinished) {
@@ -533,7 +531,7 @@
OnElementCheck(Eq(Selector({"element"})), _))
.WillRepeatedly(RunOnceCallback<1>(true));
EXPECT_CALL(executor_callback_, Run(_));
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
ASSERT_EQ(1u, processed_actions_capture.size());
EXPECT_EQ(ACTION_APPLIED, processed_actions_capture[0].status());
@@ -562,7 +560,7 @@
OnElementCheck(Eq(Selector({"element"})), _))
.WillRepeatedly(RunOnceCallback<1>(false));
EXPECT_CALL(executor_callback_, Run(_));
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
ASSERT_EQ(1u, processed_actions_capture.size());
EXPECT_EQ(ACTION_APPLIED, processed_actions_capture[0].status());
@@ -1012,7 +1010,7 @@
// timeout.
delegate_.UpdateNavigationState(/* navigating= */ true, /* error= */ false);
for (int i = 0; i < 5; i++) {
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
}
// The end of navigation un-pauses WaitForDom.
@@ -1166,7 +1164,7 @@
EXPECT_CALL(mock_web_controller_,
OnElementCheck(Eq(Selector({"element"})), _))
.WillOnce(RunOnceCallback<1>(true));
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
ASSERT_THAT(processed_actions_capture, SizeIs(1));
EXPECT_EQ(ACTION_APPLIED, processed_actions_capture[0].status());
diff --git a/components/blacklist/opt_out_blacklist/opt_out_blacklist_unittest.cc b/components/blacklist/opt_out_blacklist/opt_out_blacklist_unittest.cc
index 2967635..6324aaa 100644
--- a/components/blacklist/opt_out_blacklist/opt_out_blacklist_unittest.cc
+++ b/components/blacklist/opt_out_blacklist/opt_out_blacklist_unittest.cc
@@ -271,7 +271,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Observer to |black_list_|.
TestOptOutBlacklistDelegate blacklist_delegate_;
diff --git a/components/blacklist/opt_out_blacklist/sql/opt_out_store_sql_unittest.cc b/components/blacklist/opt_out_blacklist/sql/opt_out_store_sql_unittest.cc
index b251df1..30a60d8 100644
--- a/components/blacklist/opt_out_blacklist/sql/opt_out_store_sql_unittest.cc
+++ b/components/blacklist/opt_out_blacklist/sql/opt_out_store_sql_unittest.cc
@@ -93,7 +93,7 @@
void TearDown() override { DestroyStore(); }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The backing SQL store.
std::unique_ptr<OptOutStoreSQL> store_;
diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
index 3541b48..f365d6a 100644
--- a/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -32,7 +32,7 @@
void SetUp() override;
void TearDown() override;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple prefs_;
std::unique_ptr<BookmarkModel> model_;
diff --git a/components/bookmarks/browser/bookmark_model_unittest.cc b/components/bookmarks/browser/bookmark_model_unittest.cc
index aafb321..43d179c5 100644
--- a/components/bookmarks/browser/bookmark_model_unittest.cc
+++ b/components/bookmarks/browser/bookmark_model_unittest.cc
@@ -1231,7 +1231,7 @@
// Create a model with a single url.
base::ScopedTempDir tmp_dir;
ASSERT_TRUE(tmp_dir.CreateUniqueTempDir());
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<BookmarkModel> model =
std::make_unique<BookmarkModel>(std::make_unique<TestBookmarkClient>());
model->Load(nullptr, tmp_dir.GetPath(), base::ThreadTaskRunnerHandle::Get(),
diff --git a/components/bookmarks/browser/bookmark_node_data_unittest.cc b/components/bookmarks/browser/bookmark_node_data_unittest.cc
index 2abbcde..44add896 100644
--- a/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@ -27,8 +27,7 @@
class BookmarkNodeDataTest : public testing::Test {
public:
BookmarkNodeDataTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
model_ = TestBookmarkClient::CreateModel();
@@ -56,7 +55,7 @@
private:
base::ScopedTempDir profile_dir_;
std::unique_ptr<BookmarkModel> model_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(BookmarkNodeDataTest);
};
diff --git a/components/bookmarks/browser/bookmark_utils_unittest.cc b/components/bookmarks/browser/bookmark_utils_unittest.cc
index 9cfd4d9f..2a73c0b 100644
--- a/components/bookmarks/browser/bookmark_utils_unittest.cc
+++ b/components/bookmarks/browser/bookmark_utils_unittest.cc
@@ -32,8 +32,7 @@
public BaseBookmarkModelObserver {
public:
BookmarkUtilsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
grouped_changes_beginning_count_(0),
grouped_changes_ended_count_(0) {}
@@ -74,7 +73,7 @@
}
// Clipboard requires a message loop.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
int grouped_changes_beginning_count_;
int grouped_changes_ended_count_;
diff --git a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
index 4015e23a..c9760d7 100644
--- a/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
+++ b/components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc
@@ -165,7 +165,7 @@
}
base::ScopedTempDir scoped_temp_dir_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple prefs_;
std::unique_ptr<BookmarkModel> model_;
MockBookmarkModelObserver observer_;
diff --git a/components/browser_watcher/watcher_metrics_provider_win_unittest.cc b/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
index f2c70b2bc..9b159a3 100644
--- a/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
+++ b/components/browser_watcher/watcher_metrics_provider_win_unittest.cc
@@ -65,7 +65,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
registry_util::RegistryOverrideManager override_manager_;
base::HistogramTester histogram_tester_;
};
@@ -138,7 +138,7 @@
provider.OnRecordingDisabled();
// Flush the task(s).
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Make sure the subkey for the pseudo process has been deleted on reporting.
ASSERT_EQ(ERROR_FILE_NOT_FOUND,
diff --git a/components/browsing_data/core/browsing_data_utils_unittest.cc b/components/browsing_data/core/browsing_data_utils_unittest.cc
index defe122..acef4a6 100644
--- a/components/browsing_data/core/browsing_data_utils_unittest.cc
+++ b/components/browsing_data/core/browsing_data_utils_unittest.cc
@@ -50,7 +50,7 @@
PrefService* prefs() { return &prefs_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
};
diff --git a/components/browsing_data/core/counters/browsing_data_counter_unittest.cc b/components/browsing_data/core/counters/browsing_data_counter_unittest.cc
index 60ddc66..1c4e23c 100644
--- a/components/browsing_data/core/counters/browsing_data_counter_unittest.cc
+++ b/components/browsing_data/core/counters/browsing_data_counter_unittest.cc
@@ -104,7 +104,7 @@
private:
std::unique_ptr<TestingPrefServiceSimple> pref_service_;
std::unique_ptr<MockBrowsingDataCounter> counter_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BrowsingDataCounterTest, NoResponse) {
diff --git a/components/browsing_data/core/history_notice_utils_unittest.cc b/components/browsing_data/core/history_notice_utils_unittest.cc
index 2aacba6..9e19f736 100644
--- a/components/browsing_data/core/history_notice_utils_unittest.cc
+++ b/components/browsing_data/core/history_notice_utils_unittest.cc
@@ -60,7 +60,7 @@
std::unique_ptr<syncer::TestSyncService> sync_service_;
std::unique_ptr<history::FakeWebHistoryService> history_service_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(HistoryNoticeUtilsTest, NotSyncing) {
diff --git a/components/captive_portal/captive_portal_detector_unittest.cc b/components/captive_portal/captive_portal_detector_unittest.cc
index badce52..8228f13 100644
--- a/components/captive_portal/captive_portal_detector_unittest.cc
+++ b/components/captive_portal/captive_portal_detector_unittest.cc
@@ -114,7 +114,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<CaptivePortalDetector> detector_;
};
diff --git a/components/cast_channel/cast_message_handler_unittest.cc b/components/cast_channel/cast_message_handler_unittest.cc
index f835e3c6..f0613333 100644
--- a/components/cast_channel/cast_message_handler_unittest.cc
+++ b/components/cast_channel/cast_message_handler_unittest.cc
@@ -73,8 +73,7 @@
class CastMessageHandlerTest : public testing::Test {
public:
CastMessageHandlerTest()
- : thread_bundle_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : thread_bundle_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
cast_socket_service_(new base::TestSimpleTaskRunner()),
handler_(&cast_socket_service_,
/* connector */ nullptr,
diff --git a/components/cast_channel/cast_transport_unittest.cc b/components/cast_channel/cast_transport_unittest.cc
index 1b3fb37..4b5ec71 100644
--- a/components/cast_channel/cast_transport_unittest.cc
+++ b/components/cast_channel/cast_transport_unittest.cc
@@ -166,7 +166,7 @@
run_loop.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockCastTransportDelegate* delegate_;
MockSocket mock_socket_;
Logger* logger_;
diff --git a/components/cast_channel/keep_alive_delegate_unittest.cc b/components/cast_channel/keep_alive_delegate_unittest.cc
index 7b4c25cb..99ce35f 100644
--- a/components/cast_channel/keep_alive_delegate_unittest.cc
+++ b/components/cast_channel/keep_alive_delegate_unittest.cc
@@ -98,7 +98,7 @@
run_loop.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockCastSocket socket_;
std::unique_ptr<KeepAliveDelegate> keep_alive_;
scoped_refptr<Logger> logger_;
diff --git a/components/certificate_transparency/chrome_require_ct_delegate_unittest.cc b/components/certificate_transparency/chrome_require_ct_delegate_unittest.cc
index b0df303..7242c3c 100644
--- a/components/certificate_transparency/chrome_require_ct_delegate_unittest.cc
+++ b/components/certificate_transparency/chrome_require_ct_delegate_unittest.cc
@@ -39,8 +39,8 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
scoped_refptr<net::X509Certificate> cert_;
net::HashValueVector hashes_;
};
diff --git a/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc b/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
index fe03912..c200df1 100644
--- a/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
+++ b/components/chromeos_camera/jpeg_encode_accelerator_unittest.cc
@@ -160,7 +160,7 @@
};
void JpegEncodeAcceleratorTestEnvironment::SetUp() {
- // Since base::test::ScopedTaskEnvironment will call
+ // Since base::test::TaskEnvironment will call
// TestTimeouts::action_max_timeout(), TestTimeouts::Initialize() needs to be
// called in advance.
TestTimeouts::Initialize();
@@ -680,7 +680,7 @@
// This is needed to allow the usage of methods in post_task.h in
// JpegEncodeAccelerator implementations.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The elements of |test_aligned_images_| and |test_images_| are
// owned by JpegEncodeAcceleratorTestEnvironment.
diff --git a/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service_unittest.cc b/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service_unittest.cc
index ff7af02e..1cf4f201 100644
--- a/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service_unittest.cc
+++ b/components/chromeos_camera/mojo_mjpeg_decode_accelerator_service_unittest.cc
@@ -46,7 +46,7 @@
private:
// This is required to allow base::ThreadTaskRunnerHandle::Get() from the
// test execution thread.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(MojoMjpegDecodeAcceleratorServiceTest, InitializeAndDecode) {
diff --git a/components/component_updater/component_installer_unittest.cc b/components/component_updater/component_installer_unittest.cc
index f963f8b..f67f37a6 100644
--- a/components/component_updater/component_installer_unittest.cc
+++ b/components/component_updater/component_installer_unittest.cc
@@ -200,7 +200,7 @@
void Unpack(const base::FilePath& crx_path);
ComponentUnpacker::Result result() const { return result_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
void UnpackComplete(const ComponentUnpacker::Result& result);
@@ -357,7 +357,7 @@
EXPECT_EQ(0, result.error);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(base::PathExists(unpack_path));
EXPECT_CALL(update_client(), Stop()).Times(1);
@@ -388,7 +388,7 @@
result.error);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(base::PathExists(unpack_path));
EXPECT_CALL(update_client(), Stop()).Times(1);
diff --git a/components/component_updater/component_updater_service_unittest.cc b/components/component_updater/component_updater_service_unittest.cc
index 42552e6..a73b9ef 100644
--- a/components/component_updater/component_updater_service_unittest.cc
+++ b/components/component_updater/component_updater_service_unittest.cc
@@ -165,7 +165,7 @@
const UpdateScheduler::UserTask& user_task,
const UpdateScheduler::OnStopTaskCallback& on_stop);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop runloop_;
scoped_refptr<TestConfigurator> config_ =
@@ -257,7 +257,7 @@
void ComponentUpdaterTest::RunUpdateTask(
const UpdateScheduler::UserTask& user_task) {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindRepeating(
[](const UpdateScheduler::UserTask& user_task,
ComponentUpdaterTest* test) {
diff --git a/components/component_updater/timer_unittest.cc b/components/component_updater/timer_unittest.cc
index 9d5c63ea..956cdefe 100644
--- a/components/component_updater/timer_unittest.cc
+++ b/components/component_updater/timer_unittest.cc
@@ -19,12 +19,11 @@
class ComponentUpdaterTimerTest : public testing::Test {
public:
ComponentUpdaterTimerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~ComponentUpdaterTimerTest() override {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(ComponentUpdaterTimerTest, Start) {
diff --git a/components/consent_auditor/consent_sync_bridge_impl_unittest.cc b/components/consent_auditor/consent_sync_bridge_impl_unittest.cc
index 8a46ab5..e8c8b58e 100644
--- a/components/consent_auditor/consent_sync_bridge_impl_unittest.cc
+++ b/components/consent_auditor/consent_sync_bridge_impl_unittest.cc
@@ -164,7 +164,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockModelTypeChangeProcessor> mock_processor_;
std::unique_ptr<ConsentSyncBridgeImpl> bridge_;
};
diff --git a/components/content_capture/common/content_capture_mojom_traits_unittest.cc b/components/content_capture/common/content_capture_mojom_traits_unittest.cc
index f30bf75c..a655319 100644
--- a/components/content_capture/common/content_capture_mojom_traits_unittest.cc
+++ b/components/content_capture/common/content_capture_mojom_traits_unittest.cc
@@ -32,7 +32,7 @@
std::move(callback).Run(i);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(ContentCaptureStructTraitsTest);
diff --git a/components/content_settings/core/browser/cookie_settings_unittest.cc b/components/content_settings/core/browser/cookie_settings_unittest.cc
index df737bf..0b218a6 100644
--- a/components/content_settings/core/browser/cookie_settings_unittest.cc
+++ b/components/content_settings/core/browser/cookie_settings_unittest.cc
@@ -93,7 +93,7 @@
// There must be a valid ThreadTaskRunnerHandle in HostContentSettingsMap's
// scope.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
scoped_refptr<HostContentSettingsMap> settings_map_;
diff --git a/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc b/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc
index 97330ca..35fde1c 100644
--- a/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc
+++ b/components/crash/content/browser/crash_metrics_reporter_android_unittest.cc
@@ -45,8 +45,7 @@
class CrashMetricsReporterTest : public testing::Test {
public:
CrashMetricsReporterTest()
- : scoped_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : scoped_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~CrashMetricsReporterTest() override {}
protected:
@@ -82,7 +81,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_environment_;
+ base::test::TaskEnvironment scoped_environment_;
DISALLOW_COPY_AND_ASSIGN(CrashMetricsReporterTest);
};
diff --git a/components/cronet/host_cache_persistence_manager_unittest.cc b/components/cronet/host_cache_persistence_manager_unittest.cc
index e87ce34..ab39478 100644
--- a/components/cronet/host_cache_persistence_manager_unittest.cc
+++ b/components/cronet/host_cache_persistence_manager_unittest.cc
@@ -80,7 +80,7 @@
static const char kPrefName[];
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedMockTimeMessageLoopTaskRunner task_runner_;
// The HostCache and PrefService have to outlive the
diff --git a/components/cronet/native/runnables_unittest.cc b/components/cronet/native/runnables_unittest.cc
index 868d99a..00e92ae 100644
--- a/components/cronet/native/runnables_unittest.cc
+++ b/components/cronet/native/runnables_unittest.cc
@@ -43,7 +43,7 @@
bool callback_called() const { return callback_called_; }
// Provide a message loop for use by TestExecutor instances.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
bool callback_called_ = false;
diff --git a/components/cronet/native/test/buffer_test.cc b/components/cronet/native/test/buffer_test.cc
index a92129c..bf275e4 100644
--- a/components/cronet/native/test/buffer_test.cc
+++ b/components/cronet/native/test/buffer_test.cc
@@ -27,8 +27,8 @@
// Provide a task environment for use by TestExecutor instances. Do not
// initialize the ThreadPool as this is done by the Cronet_Engine
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
private:
void set_on_destroy_called(bool value) { on_destroy_called_ = value; }
diff --git a/components/cronet/native/test/executors_test.cc b/components/cronet/native/test/executors_test.cc
index ab92dd7..6cd59d1 100644
--- a/components/cronet/native/test/executors_test.cc
+++ b/components/cronet/native/test/executors_test.cc
@@ -24,8 +24,8 @@
// Provide a task environment for use by TestExecutor instances. Do not
// initialize the ThreadPool as this is done by the Cronet_Engine
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
private:
void set_runnable_called(bool value) { runnable_called_ = value; }
diff --git a/components/cronet/native/test/url_request_test.cc b/components/cronet/native/test/url_request_test.cc
index f74bc0a..02a2f79 100644
--- a/components/cronet/native/test/url_request_test.cc
+++ b/components/cronet/native/test/url_request_test.cc
@@ -486,8 +486,8 @@
protected:
// Provide a task environment for use by TestExecutor instances. Do not
// initialize the ThreadPool as this is done by the Cronet_Engine
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
// Not owned, |request_finished_listener_| destroys itself when run. This
// pointer is only needed to unregister the listener from the Engine in
diff --git a/components/cronet/stale_host_resolver_unittest.cc b/components/cronet/stale_host_resolver_unittest.cc
index bbe32a6..335cb33 100644
--- a/components/cronet/stale_host_resolver_unittest.cc
+++ b/components/cronet/stale_host_resolver_unittest.cc
@@ -131,8 +131,7 @@
class StaleHostResolverTest : public testing::Test {
protected:
StaleHostResolverTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
mock_network_change_notifier_(
net::test::MockNetworkChangeNotifier::Create()),
mock_proc_(new MockHostResolverProc(net::OK)),
@@ -339,7 +338,7 @@
private:
// Needed for HostResolver to run HostResolverProc callbacks.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::SimpleTestTickClock tick_clock_;
std::unique_ptr<net::test::MockNetworkChangeNotifier>
mock_network_change_notifier_;
diff --git a/components/cronet/url_request_context_config_unittest.cc b/components/cronet/url_request_context_config_unittest.cc
index fa88471..5f39f3d33 100644
--- a/components/cronet/url_request_context_config_unittest.cc
+++ b/components/cronet/url_request_context_config_unittest.cc
@@ -57,8 +57,8 @@
} // namespace
TEST(URLRequestContextConfigTest, TestExperimentalOptionParsing) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
// Create JSON for experimental options.
base::DictionaryValue options;
@@ -290,8 +290,8 @@
}
TEST(URLRequestContextConfigTest, SetSupportedQuicVersion) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -343,8 +343,8 @@
}
TEST(URLRequestContextConfigTest, SetUnsupportedQuicVersion) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -396,8 +396,8 @@
}
TEST(URLRequestContextConfigTest, SetQuicServerMigrationOptions) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -457,8 +457,8 @@
#endif
TEST(URLRequestContextConfigTest,
MAYBE_SetQuicGoAwaySessionsOnIPChangeByDefault) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -519,8 +519,8 @@
#endif
TEST(URLRequestContextConfigTest,
MAYBE_SetQuicGoAwaySessionsOnIPChangeViaExperimentOptions) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -581,8 +581,8 @@
#endif
TEST(URLRequestContextConfigTest,
MAYBE_DisableQuicGoAwaySessionsOnIPChangeViaExperimentOptions) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -633,8 +633,8 @@
}
TEST(URLRequestContextConfigTest, SetQuicConnectionMigrationV2Options) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -707,8 +707,8 @@
}
TEST(URLRequestContextConfigTest, SetQuicStaleDNSracing) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -758,8 +758,8 @@
}
TEST(URLRequestContextConfigTest, SetQuicHostWhitelist) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -810,8 +810,8 @@
}
TEST(URLRequestContextConfigTest, SetQuicMaxTimeBeforeCryptoHandshake) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -866,8 +866,8 @@
}
TEST(URLURLRequestContextConfigTest, SetQuicConnectionOptions) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
@@ -928,8 +928,8 @@
}
TEST(URLURLRequestContextConfigTest, SetAcceptLanguageAndUserAgent) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::IO);
URLRequestContextConfig config(
// Enable QUIC.
diff --git a/components/data_reduction_proxy/content/browser/data_reduction_proxy_pingback_client_impl_unittest.cc b/components/data_reduction_proxy/content/browser/data_reduction_proxy_pingback_client_impl_unittest.cc
index d51e488..178f207 100644
--- a/components/data_reduction_proxy/content/browser/data_reduction_proxy_pingback_client_impl_unittest.cc
+++ b/components/data_reduction_proxy/content/browser/data_reduction_proxy_pingback_client_impl_unittest.cc
@@ -106,10 +106,9 @@
class DataReductionProxyPingbackClientImplTest : public testing::Test {
public:
DataReductionProxyPingbackClientImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC) {
- }
+ : task_environment_(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC) {}
TestDataReductionProxyPingbackClientImpl* pingback_client() const {
return pingback_client_.get();
@@ -233,7 +232,7 @@
int num_network_requests() { return num_network_requests_; }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
network::TestURLLoaderFactory test_url_loader_factory_;
@@ -760,7 +759,7 @@
false /* black_listed */);
// Don't report the crash dump details.
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
EXPECT_EQ(upload_content_type(), "application/x-protobuf");
RecordPageloadMetricsRequest batched_request;
diff --git a/components/data_reduction_proxy/content/common/data_reduction_proxy_url_loader_throttle_unittest.cc b/components/data_reduction_proxy/content/common/data_reduction_proxy_url_loader_throttle_unittest.cc
index b479deda..88941c0 100644
--- a/components/data_reduction_proxy/content/common/data_reduction_proxy_url_loader_throttle_unittest.cc
+++ b/components/data_reduction_proxy/content/common/data_reduction_proxy_url_loader_throttle_unittest.cc
@@ -139,7 +139,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockMojoDataReductionProxy mock_mojo_data_reduction_proxy_;
};
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
index f7d56f6a..676f010 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats_unittest.cc
@@ -114,8 +114,7 @@
class DataReductionProxyCompressionStatsTest : public testing::Test {
protected:
DataReductionProxyCompressionStatsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
EXPECT_TRUE(base::Time::FromString(kLastUpdateTime, &now_));
}
@@ -500,7 +499,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<DataReductionProxyTestContext> drp_test_context_;
std::unique_ptr<DataReductionProxyCompressionStats> compression_stats_;
base::Time now_;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
index 0bb1795e0..fcc54f4 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_service_client_unittest.cc
@@ -400,7 +400,7 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory>
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
index cfa0d34d..aaa70f5 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_config_unittest.cc
@@ -201,7 +201,7 @@
}
content::TestBrowserThreadBundle task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<DataReductionProxyTestContext> test_context_;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
index b363d69..135770c0 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_configurator_unittest.cc
@@ -101,7 +101,7 @@
}
TestingPrefServiceSimple test_prefs;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<DataReductionProxyTestContext> test_context_;
std::unique_ptr<DataReductionProxyConfigurator> config_;
std::unique_ptr<NetworkPropertiesManager> manager_;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
index 2056849..cf9fba09 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_data_unittest.cc
@@ -26,8 +26,8 @@
DataReductionProxyDataTest() {}
private:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
};
TEST_F(DataReductionProxyDataTest, BasicSettersAndGetters) {
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
index 3b9b8d7..6a4e617 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc
@@ -173,8 +173,8 @@
EXPECT_EQ(expected_header, header_value);
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<TestDataReductionProxyRequestOptions> request_options_;
std::unique_ptr<DataReductionProxyTestContext> test_context_;
net::HttpRequestHeaders callback_headers_;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service_unittest.cc
index 65c0702..c3d839a 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_service_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_service_unittest.cc
@@ -72,7 +72,7 @@
PrefService* prefs() { return &prefs_; }
protected:
- content::TestBrowserThreadBundle scoped_task_environment_;
+ content::TestBrowserThreadBundle task_environment_;
private:
TestingPrefServiceSimple prefs_;
diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
index 323e4323a..60dff09a 100644
--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_settings_unittest.cc
@@ -129,8 +129,8 @@
data_reduction_proxy::switches::kDataReductionProxyHttpProxies,
kHttpsProxy.ToURI() + ";" + kHttpProxy.ToURI());
- base::test::ScopedTaskEnvironment task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::IO};
struct TestCase {
const char* response_headers;
const char* response_body;
@@ -200,8 +200,8 @@
}
TEST(DataReductionProxySettingsStandaloneTest, TestOnProxyEnabledPrefChange) {
- base::test::ScopedTaskEnvironment task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
DataReductionProxyTestContext::Builder()
.WithMockConfig()
@@ -232,8 +232,8 @@
}
TEST(DataReductionProxySettingsStandaloneTest, TestIsProxyEnabledOrManaged) {
- base::test::ScopedTaskEnvironment task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
DataReductionProxyTestContext::Builder()
.WithMockConfig()
@@ -273,8 +273,8 @@
}
TEST(DataReductionProxySettingsStandaloneTest, TestCanUseDataReductionProxy) {
- base::test::ScopedTaskEnvironment task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
DataReductionProxyTestContext::Builder()
.WithMockConfig()
@@ -475,8 +475,8 @@
// that already have data reduction proxy on.
TEST(DataReductionProxySettingsStandaloneTest,
TestDaysSinceEnabledExistingUser) {
- base::test::ScopedTaskEnvironment task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<DataReductionProxyTestContext> drp_test_context =
DataReductionProxyTestContext::Builder()
.WithMockConfig()
diff --git a/components/data_reduction_proxy/core/browser/network_properties_manager_unittest.cc b/components/data_reduction_proxy/core/browser/network_properties_manager_unittest.cc
index 32982d4..fca9bd38 100644
--- a/components/data_reduction_proxy/core/browser/network_properties_manager_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/network_properties_manager_unittest.cc
@@ -41,8 +41,8 @@
base::HistogramTester histogram_tester;
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
std::string network_id("test");
@@ -92,8 +92,8 @@
TEST(NetworkPropertyTest, TestSetterGetterDisallowedByCarrier) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
network_properties_manager.SetIsSecureProxyDisallowedByCarrier(true);
@@ -110,8 +110,8 @@
TEST(NetworkPropertyTest, TestWarmupURLFailedOnSecureCoreProxy) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
network_properties_manager.SetHasWarmupURLProbeFailed(
@@ -136,8 +136,8 @@
TEST(NetworkPropertyTest, TestWarmupURLFailedOnInSecureCoreProxy) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
EXPECT_TRUE(network_properties_manager.IsInsecureProxyAllowed(true));
@@ -165,8 +165,8 @@
TEST(NetworkPropertyTest, TestLimitPrefSize) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
size_t num_network_ids = 100;
@@ -225,8 +225,8 @@
TEST(NetworkPropertyTest, TestChangeNetworkIDBackAndForth) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
// First network ID has a captive portal.
@@ -274,8 +274,8 @@
TEST(NetworkPropertyTest, TestNetworkQualitiesOverwrite) {
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
// First network ID has a captive portal.
@@ -325,8 +325,8 @@
base::HistogramTester histogram_tester;
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
std::string network_id("test");
@@ -383,8 +383,8 @@
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_clock,
&test_prefs);
@@ -443,8 +443,8 @@
TestingPrefServiceSimple test_prefs;
test_prefs.registry()->RegisterDictionaryPref(prefs::kNetworkProperties);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TestNetworkPropertiesManager network_properties_manager(&test_prefs);
// First network ID has a captive portal and the canary check failed.
diff --git a/components/data_reduction_proxy/core/browser/warmup_url_fetcher_unittest.cc b/components/data_reduction_proxy/core/browser/warmup_url_fetcher_unittest.cc
index a27bc32..de0932a8 100644
--- a/components/data_reduction_proxy/core/browser/warmup_url_fetcher_unittest.cc
+++ b/components/data_reduction_proxy/core/browser/warmup_url_fetcher_unittest.cc
@@ -126,7 +126,7 @@
// Test that query param for the warmup URL is randomly set.
TEST(WarmupURLFetcherTest, TestGetWarmupURLWithQueryParam) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
WarmupURLFetcherTest warmup_url_fetcher(&test_url_loader_factory);
@@ -157,7 +157,7 @@
}
TEST(WarmupURLFetcherTest, TestSuccessfulFetchWarmupURLNoViaHeader) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -167,7 +167,7 @@
EXPECT_FALSE(warmup_url_fetcher.IsFetchInFlight());
warmup_url_fetcher.FetchWarmupURL(0, DataReductionProxyServer(proxy_server));
EXPECT_TRUE(warmup_url_fetcher.IsFetchInFlight());
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
auto resource_response_head =
network::CreateResourceResponseHead(net::HTTP_OK);
@@ -203,7 +203,7 @@
}
TEST(WarmupURLFetcherTest, TestSuccessfulFetchWarmupURLWithViaHeader) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -213,7 +213,7 @@
EXPECT_FALSE(warmup_url_fetcher.IsFetchInFlight());
warmup_url_fetcher.FetchWarmupURL(0, DataReductionProxyServer(proxy_server));
EXPECT_TRUE(warmup_url_fetcher.IsFetchInFlight());
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
auto resource_response_head =
network::CreateResourceResponseHead(net::HTTP_NOT_FOUND);
@@ -255,7 +255,7 @@
TEST(WarmupURLFetcherTest,
TestSuccessfulFetchWarmupURLWithViaHeaderExperimentNotEnabled) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -295,7 +295,7 @@
}
TEST(WarmupURLFetcherTest, TestConnectionResetFetchWarmupURL) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -337,7 +337,7 @@
}
TEST(WarmupURLFetcherTest, TestFetchTimesout) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -372,8 +372,8 @@
}
TEST(WarmupURLFetcherTest, TestSuccessfulFetchWarmupURLWithDelay) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
network::TestURLLoaderFactory test_url_loader_factory;
base::HistogramTester histogram_tester;
@@ -383,7 +383,7 @@
EXPECT_FALSE(warmup_url_fetcher.IsFetchInFlight());
warmup_url_fetcher.SetFetchWaitTime(base::TimeDelta::FromMilliseconds(1));
warmup_url_fetcher.FetchWarmupURL(1, DataReductionProxyServer(proxy_server));
- scoped_task_environment.FastForwardBy(base::TimeDelta::FromMilliseconds(2));
+ task_environment.FastForwardBy(base::TimeDelta::FromMilliseconds(2));
auto resource_response_head =
network::CreateResourceResponseHead(net::HTTP_NOT_FOUND);
@@ -430,7 +430,7 @@
base::HistogramTester histogram_tester;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
DataReductionProxyServer proxy_server(net::ProxyServer::Direct());
@@ -460,7 +460,7 @@
TEST(WarmupURLFetcherTest, TestFetchWaitTime) {
base::HistogramTester histogram_tester;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
DataReductionProxyServer proxy_server(net::ProxyServer::Direct());
diff --git a/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc b/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc
index ba0b7aa..7be8b933 100644
--- a/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc
+++ b/components/discardable_memory/service/discardable_shared_memory_manager_unittest.cc
@@ -66,7 +66,7 @@
}
// DiscardableSharedMemoryManager requires a message loop.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestDiscardableSharedMemoryManager> manager_;
};
@@ -240,7 +240,7 @@
void SetUp() override { manager_.reset(new DiscardableSharedMemoryManager); }
// DiscardableSharedMemoryManager requires a message loop.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<DiscardableSharedMemoryManager> manager_;
};
diff --git a/components/dom_distiller/core/distilled_content_store_unittest.cc b/components/dom_distiller/core/distilled_content_store_unittest.cc
index f223607..b62c2148 100644
--- a/components/dom_distiller/core/distilled_content_store_unittest.cc
+++ b/components/dom_distiller/core/distilled_content_store_unittest.cc
@@ -78,7 +78,7 @@
// Tests whether saving and then loading a single article works as expected.
TEST_F(InMemoryContentStoreTest, SaveAndLoadSingleArticle) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
const ArticleEntry entry = CreateEntry("test-id", "url1", "url2", "url3");
const DistilledArticleProto stored_proto =
CreateDistilledArticleForEntry(entry);
@@ -101,7 +101,7 @@
// Tests that loading articles which have never been stored, yields a callback
// where success is false.
TEST_F(InMemoryContentStoreTest, LoadNonExistentArticle) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
const ArticleEntry entry = CreateEntry("bogus-id", "url1", "url2", "url3");
store_->LoadContent(entry,
base::Bind(&InMemoryContentStoreTest::OnLoadCallback,
@@ -114,7 +114,7 @@
// of save and store does not matter when the total number of articles does not
// exceed |kDefaultMaxNumCachedEntries|.
TEST_F(InMemoryContentStoreTest, SaveAndLoadMultipleArticles) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
// Store first article.
const ArticleEntry first_entry = CreateEntry("first", "url1", "url2", "url3");
const DistilledArticleProto first_stored_proto =
@@ -162,7 +162,7 @@
// Verifies that the content store does not store unlimited number of articles,
// but expires the oldest ones when the limit for number of articles is reached.
TEST_F(InMemoryContentStoreTest, SaveAndLoadMoreThanMaxArticles) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
// Create a new store with only |kMaxNumArticles| articles as the limit.
const int kMaxNumArticles = 3;
@@ -239,7 +239,7 @@
// Tests whether saving and then loading a single article works as expected.
TEST_F(InMemoryContentStoreTest, LookupArticleByURL) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
const ArticleEntry entry = CreateEntry("test-id", "url1", "url2", "url3");
const DistilledArticleProto stored_proto =
CreateDistilledArticleForEntry(entry);
@@ -275,7 +275,7 @@
// Verifies that the content store does not store unlimited number of articles,
// but expires the oldest ones when the limit for number of articles is reached.
TEST_F(InMemoryContentStoreTest, LoadArticleByURLAfterExpungedFromCache) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
// Create a new store with only |kMaxNumArticles| articles as the limit.
const int kMaxNumArticles = 1;
diff --git a/components/dom_distiller/core/distilled_page_prefs_unittests.cc b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
index 921d4fbc..073aba3 100644
--- a/components/dom_distiller/core/distilled_page_prefs_unittests.cc
+++ b/components/dom_distiller/core/distilled_page_prefs_unittests.cc
@@ -58,7 +58,7 @@
std::unique_ptr<DistilledPagePrefs> distilled_page_prefs_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(DistilledPagePrefsTest, TestingOnChangeFontIsBeingCalled) {
diff --git a/components/dom_distiller/core/distiller_unittest.cc b/components/dom_distiller/core/distiller_unittest.cc
index 48a1ee4..2f9ff255 100644
--- a/components/dom_distiller/core/distiller_unittest.cc
+++ b/components/dom_distiller/core/distiller_unittest.cc
@@ -308,8 +308,8 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<DistillerImpl> distiller_;
std::unique_ptr<DistilledArticleProto> article_proto_;
std::vector<ArticleDistillationUpdate> in_sequence_updates_;
diff --git a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
index 0d53174..66b4e68 100644
--- a/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
+++ b/components/dom_distiller/core/distiller_url_fetcher_unittest.cc
@@ -50,8 +50,8 @@
CHECK_EQ(expected_response, response_);
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<dom_distiller::DistillerURLFetcher> url_fetcher_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory>
diff --git a/components/dom_distiller/core/dom_distiller_service_unittest.cc b/components/dom_distiller/core/dom_distiller_service_unittest.cc
index 5a6c5ac..85bea86a 100644
--- a/components/dom_distiller/core/dom_distiller_service_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_service_unittest.cc
@@ -103,7 +103,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// store is owned by service_.
DomDistillerStoreInterface* store_;
MockDistillerFactory* distiller_factory_;
diff --git a/components/dom_distiller/core/dom_distiller_store_unittest.cc b/components/dom_distiller/core/dom_distiller_store_unittest.cc
index c68f6d3..6c11665 100644
--- a/components/dom_distiller/core/dom_distiller_store_unittest.cc
+++ b/components/dom_distiller/core/dom_distiller_store_unittest.cc
@@ -159,7 +159,7 @@
return data;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
EntryMap db_model_;
EntryMap sync_model_;
diff --git a/components/dom_distiller/core/task_tracker_unittest.cc b/components/dom_distiller/core/task_tracker_unittest.cc
index b31e3f5..c2b9398 100644
--- a/components/dom_distiller/core/task_tracker_unittest.cc
+++ b/components/dom_distiller/core/task_tracker_unittest.cc
@@ -78,7 +78,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::string entry_id_;
GURL page_0_url_;
GURL page_1_url_;
diff --git a/components/domain_reliability/uploader_unittest.cc b/components/domain_reliability/uploader_unittest.cc
index 374f2fe..70bc6c4a 100644
--- a/components/domain_reliability/uploader_unittest.cc
+++ b/components/domain_reliability/uploader_unittest.cc
@@ -196,8 +196,8 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
UploadInterceptor* interceptor_;
MockTime time_;
diff --git a/components/download/internal/background_service/in_memory_download_unittest.cc b/components/download/internal/background_service/in_memory_download_unittest.cc
index 535f4903..dbcdd77a 100644
--- a/components/download/internal/background_service/in_memory_download_unittest.cc
+++ b/components/download/internal/background_service/in_memory_download_unittest.cc
@@ -172,7 +172,7 @@
std::unique_ptr<base::Thread> io_thread_;
// Created before other objects to provide test environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<InMemoryDownloadImpl> download_;
std::unique_ptr<NiceMock<MockDelegate>> mock_delegate_;
diff --git a/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc b/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc
index e3da016..0bd083403 100644
--- a/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc
+++ b/components/download/internal/background_service/scheduler/device_status_listener_unittest.cc
@@ -146,7 +146,7 @@
MockObserver mock_observer_;
// Needed for network change notifier and power monitor.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::PowerMonitorTestSource* power_source_;
TestBatteryStatusListener* test_battery_listener_;
};
diff --git a/components/download/internal/common/download_db_cache_unittest.cc b/components/download/internal/common/download_db_cache_unittest.cc
index 1133226..2700a647 100644
--- a/components/download/internal/common/download_db_cache_unittest.cc
+++ b/components/download/internal/common/download_db_cache_unittest.cc
@@ -109,7 +109,7 @@
leveldb_proto::test::FakeDB<download_pb::DownloadDBEntry>* db_;
std::unique_ptr<DownloadDBCache> db_cache_;
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(DownloadDBCacheTest);
};
diff --git a/components/download/internal/common/download_file_unittest.cc b/components/download/internal/common/download_file_unittest.cc
index 767e646..a6a6e320 100644
--- a/components/download/internal/common/download_file_unittest.cc
+++ b/components/download/internal/common/download_file_unittest.cc
@@ -500,7 +500,7 @@
closure.Run();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// DownloadFile::RenameAndAnnotate and DownloadFile::RenameAndUniquify have a
diff --git a/components/download/internal/common/download_item_impl_unittest.cc b/components/download/internal/common/download_item_impl_unittest.cc
index 5b66866..9dbc005 100644
--- a/components/download/internal/common/download_item_impl_unittest.cc
+++ b/components/download/internal/common/download_item_impl_unittest.cc
@@ -232,8 +232,8 @@
public:
DownloadItemTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
next_download_id_(DownloadItem::kInvalidId + 1) {
create_info_.reset(new DownloadCreateInfo());
create_info_->save_info =
@@ -377,7 +377,7 @@
bool canceled() { return canceled_; }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
StrictMock<MockDelegate> mock_delegate_;
diff --git a/components/download/internal/common/download_path_reservation_tracker_unittest.cc b/components/download/internal/common/download_path_reservation_tracker_unittest.cc
index 1b6ccde..7c4cad2 100644
--- a/components/download/internal/common/download_path_reservation_tracker_unittest.cc
+++ b/components/download/internal/common/download_path_reservation_tracker_unittest.cc
@@ -75,7 +75,7 @@
base::ScopedTempDir test_download_dir_;
base::FilePath default_download_path_;
base::FilePath fallback_directory_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
void TestReservedPathCallback(base::FilePath* return_path,
@@ -138,7 +138,7 @@
}
void DownloadPathReservationTrackerTest::RunUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void DownloadPathReservationTrackerTest::CallGetReservedPath(
@@ -157,7 +157,7 @@
create_directory, conflict_action,
base::Bind(&DownloadPathReservationTrackerTest::TestReservedPathCallback,
weak_ptr_factory.GetWeakPtr(), return_path, return_result));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void DownloadPathReservationTrackerTest::TestReservedPathCallback(
diff --git a/components/download/internal/common/download_ukm_helper_unittest.cc b/components/download/internal/common/download_ukm_helper_unittest.cc
index a3c3fed2..d6b9fa84 100644
--- a/components/download/internal/common/download_ukm_helper_unittest.cc
+++ b/components/download/internal/common/download_ukm_helper_unittest.cc
@@ -45,7 +45,7 @@
protected:
int download_id_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_recorder_;
DISALLOW_COPY_AND_ASSIGN(DownloadUkmHelperTest);
diff --git a/components/download/internal/common/parallel_download_job_unittest.cc b/components/download/internal/common/parallel_download_job_unittest.cc
index c3abdd9..4b4e5084 100644
--- a/components/download/internal/common/parallel_download_job_unittest.cc
+++ b/components/download/internal/common/parallel_download_job_unittest.cc
@@ -107,9 +107,9 @@
class ParallelDownloadJobTest : public testing::Test {
public:
ParallelDownloadJobTest()
- : task_environment_(base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::
- ThreadPoolExecutionMode::QUEUED) {}
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
void CreateParallelJob(int64_t initial_request_offset,
int64_t content_length,
@@ -162,7 +162,7 @@
file_initialized_ = true;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockDownloadItem> download_item_;
std::unique_ptr<ParallelDownloadJobForTest> job_;
bool file_initialized_;
diff --git a/components/drive/drive_uploader_unittest.cc b/components/drive/drive_uploader_unittest.cc
index f45c1cf..4a7c850 100644
--- a/components/drive/drive_uploader_unittest.cc
+++ b/components/drive/drive_uploader_unittest.cc
@@ -420,7 +420,7 @@
void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
};
diff --git a/components/drive/local_file_reader_unittest.cc b/components/drive/local_file_reader_unittest.cc
index b6a9e46..e464a361 100644
--- a/components/drive/local_file_reader_unittest.cc
+++ b/components/drive/local_file_reader_unittest.cc
@@ -56,7 +56,7 @@
std::make_unique<LocalFileReader>(worker_thread_->task_runner().get());
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<base::Thread> worker_thread_;
std::unique_ptr<LocalFileReader> file_reader_;
diff --git a/components/drive/service/fake_drive_service_unittest.cc b/components/drive/service/fake_drive_service_unittest.cc
index 49b3c63..bbf1d43 100644
--- a/components/drive/service/fake_drive_service_unittest.cc
+++ b/components/drive/service/fake_drive_service_unittest.cc
@@ -227,7 +227,7 @@
return about_resource->largest_change_id();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeDriveService fake_service_;
};
diff --git a/components/exo/data_source_unittest.cc b/components/exo/data_source_unittest.cc
index e1cf092..22ca10b 100644
--- a/components/exo/data_source_unittest.cc
+++ b/components/exo/data_source_unittest.cc
@@ -20,9 +20,9 @@
class DataSourceTest : public testing::Test {
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_ = {
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC};
+ base::test::TaskEnvironment task_environment_ = {
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC};
};
class TestDataSourceDelegate : public DataSourceDelegate {
@@ -94,7 +94,7 @@
std::string string_data(data.begin(), data.end());
EXPECT_EQ(std::string(kTestData), string_data);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DataSourceTest, ReadDataArbitraryMimeType) {
@@ -109,7 +109,7 @@
std::string string_data(data.begin(), data.end());
EXPECT_EQ(std::string(kTestData), string_data);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DataSourceTest, ReadData_UnknownMimeType) {
@@ -124,7 +124,7 @@
FAIL() << "Callback should not be invoked when known "
"mimetype is not offerred";
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DataSourceTest, ReadData_Destroyed) {
@@ -141,7 +141,7 @@
"data source is destroyed";
}));
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DataSourceTest, ReadData_Cancelled) {
@@ -156,7 +156,7 @@
FAIL() << "Callback should not be invoked after cancelled";
}));
data_source.Cancelled();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DataSourceTest, PreferredMimeTypeUTF16) {
diff --git a/components/exo/wayland/clients/test/run_all_client_perftests.cc b/components/exo/wayland/clients/test/run_all_client_perftests.cc
index 90c54c8..023acaf 100644
--- a/components/exo/wayland/clients/test/run_all_client_perftests.cc
+++ b/components/exo/wayland/clients/test/run_all_client_perftests.cc
@@ -55,9 +55,8 @@
if (run_with_external_wayland_server_) {
base::TestSuite::Initialize();
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
} else {
// We only need initialized ash related stuff for running wayland server
// within the test.
@@ -65,9 +64,8 @@
// Initialize task envrionment here instead of Test::SetUp(), because all
// tests and their SetUp() will be running in client thread.
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
// Set the UI thread task runner to WaylandClientTest, so all tests can
// post tasks to UI thread.
@@ -78,11 +76,11 @@
void Shutdown() override {
if (run_with_external_wayland_server_) {
- scoped_task_environment_ = nullptr;
+ task_environment_ = nullptr;
base::TestSuite::Shutdown();
} else {
WaylandClientTest::SetUIThreadTaskRunner(nullptr);
- scoped_task_environment_ = nullptr;
+ task_environment_ = nullptr;
ash::AshTestSuite::Shutdown();
}
}
@@ -96,7 +94,7 @@
// Do not run the wayland server within the test.
const bool run_with_external_wayland_server_ = false;
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
// Result of RUN_ALL_TESTS().
int result_ = 1;
diff --git a/components/exo/wayland/fuzzer/server_environment.h b/components/exo/wayland/fuzzer/server_environment.h
index 04f15b5..6b1a1d21 100644
--- a/components/exo/wayland/fuzzer/server_environment.h
+++ b/components/exo/wayland/fuzzer/server_environment.h
@@ -31,7 +31,7 @@
private:
std::unique_ptr<aura::Env> env_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread ui_thread_;
};
diff --git a/components/favicon/core/favicon_handler_unittest.cc b/components/favicon/core/favicon_handler_unittest.cc
index 24d2156..d54b4e0 100644
--- a/components/favicon/core/favicon_handler_unittest.cc
+++ b/components/favicon/core/favicon_handler_unittest.cc
@@ -492,8 +492,7 @@
const GURL kIconURL64x64 = GURL("http://www.google.com/favicon64x64");
FaviconHandlerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
// Register various known icon URLs.
delegate_.fake_image_downloader().Add(kIconURL10x10, IntVector{10});
delegate_.fake_image_downloader().Add(kIconURL12x12, IntVector{12});
@@ -547,7 +546,7 @@
candidates, manifest_url);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
scoped_set_supported_scale_factors_;
testing::NiceMock<MockFaviconServiceWithFake> favicon_service_;
diff --git a/components/favicon/core/favicon_service_impl_unittest.cc b/components/favicon/core/favicon_service_impl_unittest.cc
index 65709ea..97b67d9 100644
--- a/components/favicon/core/favicon_service_impl_unittest.cc
+++ b/components/favicon/core/favicon_service_impl_unittest.cc
@@ -17,7 +17,7 @@
namespace {
TEST(FaviconServiceImplTest, ShouldCacheUnableToDownloadFavicons) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir history_dir;
CHECK(history_dir.CreateUniqueTempDir());
std::unique_ptr<history::HistoryService> history_service =
diff --git a/components/favicon/core/large_icon_service_impl_unittest.cc b/components/favicon/core/large_icon_service_impl_unittest.cc
index 5be7802..eaf99de 100644
--- a/components/favicon/core/large_icon_service_impl_unittest.cc
+++ b/components/favicon/core/large_icon_service_impl_unittest.cc
@@ -127,7 +127,7 @@
~LargeIconServiceTest() override {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ui::test::ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
NiceMock<MockImageFetcher>* mock_image_fetcher_;
testing::NiceMock<MockFaviconService> mock_favicon_service_;
@@ -175,7 +175,7 @@
EXPECT_CALL(callback,
Run(favicon_base::GoogleFaviconServerRequestStatus::SUCCESS));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
histogram_tester_.ExpectUniqueSample(
"Favicons.LargeIconService.DownloadedSize", 64, /*expected_count=*/1);
}
@@ -221,7 +221,7 @@
EXPECT_CALL(callback,
Run(favicon_base::GoogleFaviconServerRequestStatus::SUCCESS));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(LargeIconServiceTest, ShouldTrimQueryParametersForGoogleServer) {
@@ -254,7 +254,7 @@
TRAFFIC_ANNOTATION_FOR_TESTS,
favicon_base::GoogleFaviconServerCallback());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(LargeIconServiceTest, ShouldNotCheckOnPublicUrls) {
@@ -284,7 +284,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_CONNECTION_ERROR));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(LargeIconServiceTest, ShouldNotQueryGoogleServerIfInvalidScheme) {
@@ -302,7 +302,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_TARGET_URL_SKIPPED));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(histogram_tester_.GetAllSamples(
"Favicons.LargeIconService.DownloadedSize"),
IsEmpty());
@@ -323,7 +323,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_TARGET_URL_INVALID));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(histogram_tester_.GetAllSamples(
"Favicons.LargeIconService.DownloadedSize"),
IsEmpty());
@@ -360,7 +360,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_CONNECTION_ERROR));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Verify that download failure gets recorded.
histogram_tester_.ExpectUniqueSample(
"Favicons.LargeIconService.DownloadedSize", 0, /*expected_count=*/1);
@@ -388,7 +388,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_HTTP_ERROR_CACHED));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(histogram_tester_.GetAllSamples(
"Favicons.LargeIconService.DownloadedSize"),
IsEmpty());
@@ -417,7 +417,7 @@
EXPECT_CALL(callback, Run(favicon_base::GoogleFaviconServerRequestStatus::
FAILURE_ICON_EXISTS_IN_DB));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(histogram_tester_.GetAllSamples(
"Favicons.LargeIconService.DownloadedSize"),
IsEmpty());
@@ -448,7 +448,7 @@
base::Unretained(this)),
&cancelable_task_tracker_);
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void RawBitmapResultCallback(const favicon_base::LargeIconResult& result) {
diff --git a/components/feature_engagement/internal/in_memory_event_store_unittest.cc b/components/feature_engagement/internal/in_memory_event_store_unittest.cc
index 73bf2b4..4e5b3145 100644
--- a/components/feature_engagement/internal/in_memory_event_store_unittest.cc
+++ b/components/feature_engagement/internal/in_memory_event_store_unittest.cc
@@ -33,7 +33,7 @@
bool load_callback_has_been_invoked_;
bool last_result_;
std::unique_ptr<std::vector<Event>> loaded_events_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
} // namespace
diff --git a/components/feature_engagement/internal/never_availability_model_unittest.cc b/components/feature_engagement/internal/never_availability_model_unittest.cc
index a8d5421..90e981e 100644
--- a/components/feature_engagement/internal/never_availability_model_unittest.cc
+++ b/components/feature_engagement/internal/never_availability_model_unittest.cc
@@ -31,7 +31,7 @@
base::Optional<bool> success_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(NeverAvailabilityModelTest);
};
diff --git a/components/feature_engagement/internal/tracker_impl_unittest.cc b/components/feature_engagement/internal/tracker_impl_unittest.cc
index 6c422e6..d2e7330 100644
--- a/components/feature_engagement/internal/tracker_impl_unittest.cc
+++ b/components/feature_engagement/internal/tracker_impl_unittest.cc
@@ -415,7 +415,7 @@
virtual bool ShouldAvailabilityStoreBeReady() { return true; }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TrackerImpl> tracker_;
TestTrackerInMemoryEventStore* event_store_;
TestTrackerAvailabilityModel* availability_model_;
diff --git a/components/feed/content/feed_offline_host_unittest.cc b/components/feed/content/feed_offline_host_unittest.cc
index e27102bfc..29c9106 100644
--- a/components/feed/content/feed_offline_host_unittest.cc
+++ b/components/feed/content/feed_offline_host_unittest.cc
@@ -130,7 +130,7 @@
return status_notifications_;
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
void SetupHost() {
EXPECT_CALL(*offline_page_model(), AddObserver(testing::_))
@@ -172,7 +172,7 @@
status_notifications_.emplace_back(url, available_offline);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestOfflinePageModel offline_page_model_;
TestPrefetchService prefetch_service_;
std::unique_ptr<FeedOfflineHost> host_;
diff --git a/components/feed/core/feed_content_database_unittest.cc b/components/feed/core/feed_content_database_unittest.cc
index f154aace..f564d29 100644
--- a/components/feed/core/feed_content_database_unittest.cc
+++ b/components/feed/core/feed_content_database_unittest.cc
@@ -120,7 +120,7 @@
RunUntilIdle();
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
scoped_refptr<base::SequencedTaskRunner> task_runner() {
return task_runner_;
@@ -138,7 +138,7 @@
MOCK_METHOD1(OnStorageCommitted, void(bool));
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::map<std::string, ContentStorageProto> content_db_storage_;
diff --git a/components/feed/core/feed_image_manager_unittest.cc b/components/feed/core/feed_image_manager_unittest.cc
index 418724a..ebc0323 100644
--- a/components/feed/core/feed_image_manager_unittest.cc
+++ b/components/feed/core/feed_image_manager_unittest.cc
@@ -111,7 +111,7 @@
ASSERT_TRUE(image_database_->IsInitialized());
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
FeedImageDatabase* image_database() { return image_database_; }
@@ -144,7 +144,7 @@
FeedImageDatabase* image_database_;
base::ScopedTempDir database_dir_;
FakeImageDecoder* fake_image_decoder_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
HistogramTester histogram_;
DISALLOW_COPY_AND_ASSIGN(FeedImageManagerTest);
diff --git a/components/feed/core/feed_journal_database_unittest.cc b/components/feed/core/feed_journal_database_unittest.cc
index 7bb4a06b..9be85b1 100644
--- a/components/feed/core/feed_journal_database_unittest.cc
+++ b/components/feed/core/feed_journal_database_unittest.cc
@@ -128,7 +128,7 @@
RunUntilIdle();
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
scoped_refptr<base::SequencedTaskRunner> task_runner() {
return task_runner_;
@@ -145,7 +145,7 @@
MOCK_METHOD2(OnCheckJournalExistReceived, void(bool, bool));
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::map<std::string, JournalStorageProto> journal_db_storage_;
diff --git a/components/feed/core/feed_networking_host_unittest.cc b/components/feed/core/feed_networking_host_unittest.cc
index 57c9db4..9e13b46 100644
--- a/components/feed/core/feed_networking_host_unittest.cc
+++ b/components/feed/core/feed_networking_host_unittest.cc
@@ -72,8 +72,7 @@
&test_factory_);
net_service_ = std::make_unique<FeedNetworkingHost>(
identity_test_env_.identity_manager(), "dummy_api_key",
- shared_url_loader_factory_,
- scoped_task_environment_.GetMockTickClock());
+ shared_url_loader_factory_, task_environment_.GetMockTickClock());
}
FeedNetworkingHost* service() { return net_service_.get(); }
@@ -96,7 +95,7 @@
test_factory_.AddResponse(url, head, response_string, status);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
void SendRequestAndRespond(const std::string& url_string,
@@ -136,8 +135,8 @@
network::TestURLLoaderFactory* test_factory() { return &test_factory_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
private:
signin::IdentityTestEnvironment identity_test_env_;
@@ -172,7 +171,7 @@
&done_callback2);
SendRequestAndRespond("http://foobar.com/other", "POST", "", "", net::HTTP_OK,
network::URLLoaderCompletionStatus(), &done_callback3);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
EXPECT_TRUE(done_callback1.has_run);
EXPECT_TRUE(done_callback2.has_run);
@@ -192,7 +191,7 @@
net::HTTP_OK, network::URLLoaderCompletionStatus(),
&done_callback);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
EXPECT_TRUE(done_callback.has_run);
EXPECT_EQ(done_callback.code, 200);
}
@@ -291,7 +290,7 @@
service()->Send(GURL("http://foobar.com/feed2"), "POST", request_body,
base::BindOnce(&MockResponseDoneCallback::Done,
base::Unretained(&done_callback2)));
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
service()->CancelRequests();
}
@@ -346,7 +345,7 @@
service()->Send(url, "POST", request_body,
base::BindOnce(&MockResponseDoneCallback::Done,
base::Unretained(&done_callback)));
- scoped_task_environment_.FastForwardBy(duration);
+ task_environment_.FastForwardBy(duration);
Respond(url, "", net::HTTP_OK, network::URLLoaderCompletionStatus());
EXPECT_TRUE(done_callback.has_run);
@@ -363,10 +362,10 @@
service()->Send(url, "POST", request_body,
base::BindOnce(&MockResponseDoneCallback::Done,
base::Unretained(&done_callback)));
- scoped_task_environment_.FastForwardBy(TimeDelta::FromSeconds(29));
+ task_environment_.FastForwardBy(TimeDelta::FromSeconds(29));
EXPECT_FALSE(done_callback.has_run);
- scoped_task_environment_.FastForwardBy(TimeDelta::FromSeconds(29));
+ task_environment_.FastForwardBy(TimeDelta::FromSeconds(29));
EXPECT_TRUE(done_callback.has_run);
histogram_tester.ExpectTimeBucketCount(
"ContentSuggestions.Feed.Network.Duration", TimeDelta::FromSeconds(30),
@@ -384,10 +383,10 @@
service()->Send(url, "POST", request_body,
base::BindOnce(&MockResponseDoneCallback::Done,
base::Unretained(&done_callback)));
- scoped_task_environment_.FastForwardBy(TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(TimeDelta::FromSeconds(1));
EXPECT_FALSE(done_callback.has_run);
- scoped_task_environment_.FastForwardBy(TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(TimeDelta::FromSeconds(1));
EXPECT_TRUE(done_callback.has_run);
}
diff --git a/components/gcm_driver/account_tracker_unittest.cc b/components/gcm_driver/account_tracker_unittest.cc
index f1da246..cee2875 100644
--- a/components/gcm_driver/account_tracker_unittest.cc
+++ b/components/gcm_driver/account_tracker_unittest.cc
@@ -331,8 +331,8 @@
private:
// net:: stuff needs IO message loop.
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_test_env_;
diff --git a/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc b/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
index 02055c8..495c576 100644
--- a/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
+++ b/components/gcm_driver/crypto/gcm_encryption_provider_unittest.cc
@@ -189,7 +189,7 @@
encrypted_message_ = std::move(message);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir scoped_temp_dir_;
base::HistogramTester histogram_tester_;
diff --git a/components/gcm_driver/crypto/gcm_key_store_unittest.cc b/components/gcm_driver/crypto/gcm_key_store_unittest.cc
index a30f26cc..708f0f9 100644
--- a/components/gcm_driver/crypto/gcm_key_store_unittest.cc
+++ b/components/gcm_driver/crypto/gcm_key_store_unittest.cc
@@ -146,7 +146,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir scoped_temp_dir_;
base::HistogramTester histogram_tester_;
diff --git a/components/gcm_driver/gcm_account_tracker_unittest.cc b/components/gcm_driver/gcm_account_tracker_unittest.cc
index 1364489..09bb766 100644
--- a/components/gcm_driver/gcm_account_tracker_unittest.cc
+++ b/components/gcm_driver/gcm_account_tracker_unittest.cc
@@ -204,7 +204,7 @@
private:
CustomFakeGCMDriver driver_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_test_env_;
diff --git a/components/gcm_driver/gcm_channel_status_request_unittest.cc b/components/gcm_driver/gcm_channel_status_request_unittest.cc
index 0108bfc2..12e399d4 100644
--- a/components/gcm_driver/gcm_channel_status_request_unittest.cc
+++ b/components/gcm_driver/gcm_channel_status_request_unittest.cc
@@ -44,7 +44,7 @@
network::TestURLLoaderFactory* test_url_loader_factory();
std::unique_ptr<GCMChannelStatusRequest> request_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
bool request_callback_invoked_;
diff --git a/components/gcm_driver/gcm_client_impl_unittest.cc b/components/gcm_driver/gcm_client_impl_unittest.cc
index 5d5649e..0406d31 100644
--- a/components/gcm_driver/gcm_client_impl_unittest.cc
+++ b/components/gcm_driver/gcm_client_impl_unittest.cc
@@ -424,12 +424,12 @@
}
void FastForwardBy(const base::TimeDelta& duration) {
- scoped_task_environment_.FastForwardBy(duration);
+ task_environment_.FastForwardBy(duration);
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
// Must be declared first so that it is destroyed last. Injected to
// GCM client.
@@ -460,7 +460,7 @@
: last_event_(NONE),
last_result_(GCMClient::UNKNOWN_ERROR),
url_request_context_getter_(new net::TestURLRequestContextGetter(
- scoped_task_environment_.GetMainThreadTaskRunner())) {}
+ task_environment_.GetMainThreadTaskRunner())) {}
GCMClientImplTest::~GCMClientImplTest() {}
@@ -503,7 +503,7 @@
}
void GCMClientImplTest::PumpLoopUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
bool GCMClientImplTest::CreateUniqueTempDir() {
@@ -612,7 +612,7 @@
chrome_build_info.product_category_for_subtypes = kProductCategoryForSubtypes;
gcm_client_->Initialize(
chrome_build_info, gcm_store_path(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::ThreadTaskRunnerHandle::Get(), base::DoNothing(),
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_),
diff --git a/components/gcm_driver/gcm_driver_desktop_unittest.cc b/components/gcm_driver/gcm_driver_desktop_unittest.cc
index b40a972..c8a20ca 100644
--- a/components/gcm_driver/gcm_driver_desktop_unittest.cc
+++ b/components/gcm_driver/gcm_driver_desktop_unittest.cc
@@ -166,8 +166,8 @@
private:
base::ScopedTempDir temp_dir_;
TestingPrefServiceSimple prefs_;
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::Thread io_thread_;
network::TestURLLoaderFactory test_url_loader_factory_;
diff --git a/components/gcm_driver/gcm_driver_unittest.cc b/components/gcm_driver/gcm_driver_unittest.cc
index b9735a04..7cc22dba 100644
--- a/components/gcm_driver/gcm_driver_unittest.cc
+++ b/components/gcm_driver/gcm_driver_unittest.cc
@@ -103,8 +103,8 @@
private:
base::ScopedTempDir temp_dir_;
TestingPrefServiceSimple prefs_;
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::Thread io_thread_;
network::TestURLLoaderFactory test_url_loader_factory_;
diff --git a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc
index af1d93f..c10636c 100644
--- a/components/gcm_driver/instance_id/instance_id_driver_unittest.cc
+++ b/components/gcm_driver/instance_id/instance_id_driver_unittest.cc
@@ -88,7 +88,7 @@
void GetTokenCompleted(const std::string& token, InstanceID::Result result);
void DeleteTokenCompleted(InstanceID::Result result);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeGCMDriverForInstanceID> gcm_driver_;
std::unique_ptr<InstanceIDDriver> driver_;
@@ -109,8 +109,7 @@
};
InstanceIDDriverTest::InstanceIDDriverTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
result_(InstanceID::UNKNOWN_ERROR),
async_operation_completed_(false) {}
diff --git a/components/history/core/browser/browsing_history_service_unittest.cc b/components/history/core/browser/browsing_history_service_unittest.cc
index 2b8a03e..739cd94 100644
--- a/components/history/core/browser/browsing_history_service_unittest.cc
+++ b/components/history/core/browser/browsing_history_service_unittest.cc
@@ -297,7 +297,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Duplicates on the same day in the local timezone are removed, so set a
// baseline time in local time.
diff --git a/components/history/core/browser/expire_history_backend_unittest.cc b/components/history/core/browser/expire_history_backend_unittest.cc
index 2d0770e..af6e3fd 100644
--- a/components/history/core/browser/expire_history_backend_unittest.cc
+++ b/components/history/core/browser/expire_history_backend_unittest.cc
@@ -84,7 +84,7 @@
: backend_client_(history_client_.CreateBackendClient()),
expirer_(this,
backend_client_.get(),
- scoped_task_environment_.GetMainThreadTaskRunner()),
+ task_environment_.GetMainThreadTaskRunner()),
now_(PretendNow()) {}
protected:
@@ -131,7 +131,7 @@
// This must be destroyed last.
base::ScopedTempDir tmp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
HistoryClientFakeBookmarks history_client_;
std::unique_ptr<HistoryBackendClient> backend_client_;
diff --git a/components/history/core/browser/history_backend_unittest.cc b/components/history/core/browser/history_backend_unittest.cc
index 89e723b3..ee3b1d6 100644
--- a/components/history/core/browser/history_backend_unittest.cc
+++ b/components/history/core/browser/history_backend_unittest.cc
@@ -282,7 +282,7 @@
URLsModifiedList urls_modified_notifications_;
URLsDeletedList urls_deleted_notifications_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FilePath test_dir_;
DISALLOW_COPY_AND_ASSIGN(HistoryBackendTestBase);
diff --git a/components/history/core/browser/history_querying_unittest.cc b/components/history/core/browser/history_querying_unittest.cc
index b51d9e9..225641d0 100644
--- a/components/history/core/browser/history_querying_unittest.cc
+++ b/components/history/core/browser/history_querying_unittest.cc
@@ -194,7 +194,7 @@
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FilePath history_dir_;
diff --git a/components/history/core/browser/history_service_unittest.cc b/components/history/core/browser/history_service_unittest.cc
index 1d86557..63cf56a 100644
--- a/components/history/core/browser/history_service_unittest.cc
+++ b/components/history/core/browser/history_service_unittest.cc
@@ -58,8 +58,7 @@
class HistoryServiceTest : public testing::Test {
public:
HistoryServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~HistoryServiceTest() override {}
@@ -155,7 +154,7 @@
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MostVisitedURLList most_visited_urls_;
diff --git a/components/history/core/browser/sync/delete_directive_handler_unittest.cc b/components/history/core/browser/sync/delete_directive_handler_unittest.cc
index a7155d84..34e4aa2 100644
--- a/components/history/core/browser/sync/delete_directive_handler_unittest.cc
+++ b/components/history/core/browser/sync/delete_directive_handler_unittest.cc
@@ -122,7 +122,7 @@
DeleteDirectiveHandler* handler() { return delete_directive_handler_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir test_dir_;
scoped_refptr<HistoryBackend> history_backend_;
std::unique_ptr<DeleteDirectiveHandler> delete_directive_handler_;
diff --git a/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc b/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc
index 81d39d1..63132b2 100644
--- a/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc
+++ b/components/history/core/browser/sync/typed_url_sync_bridge_unittest.cc
@@ -512,7 +512,7 @@
RecordingModelTypeChangeProcessor& processor() { return *processor_; }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir test_dir_;
scoped_refptr<TestHistoryBackend> fake_history_backend_;
TypedURLSyncBridge* typed_url_sync_bridge_;
diff --git a/components/history/core/browser/top_sites_impl_unittest.cc b/components/history/core/browser/top_sites_impl_unittest.cc
index a4acc31..8b93214 100644
--- a/components/history/core/browser/top_sites_impl_unittest.cc
+++ b/components/history/core/browser/top_sites_impl_unittest.cc
@@ -247,7 +247,7 @@
top_sites_impl_->ShutdownOnUIThread();
top_sites_impl_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -258,7 +258,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir scoped_temp_dir_;
diff --git a/components/history/core/browser/web_history_service_unittest.cc b/components/history/core/browser/web_history_service_unittest.cc
index 07e3f844..d529952 100644
--- a/components/history/core/browser/web_history_service_unittest.cc
+++ b/components/history/core/browser/web_history_service_unittest.cc
@@ -237,7 +237,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
TestingWebHistoryService web_history_service_;
diff --git a/components/history/core/test/history_backend_db_base_test.cc b/components/history/core/test/history_backend_db_base_test.cc
index 61b10a0..c76b6d28 100644
--- a/components/history/core/test/history_backend_db_base_test.cc
+++ b/components/history/core/test/history_backend_db_base_test.cc
@@ -59,8 +59,7 @@
};
HistoryBackendDBBaseTest::HistoryBackendDBBaseTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
db_(nullptr),
last_profile_error_(sql::INIT_OK) {}
diff --git a/components/history/core/test/history_backend_db_base_test.h b/components/history/core/test/history_backend_db_base_test.h
index 1c5cfd5..738e53a 100644
--- a/components/history/core/test/history_backend_db_base_test.h
+++ b/components/history/core/test/history_backend_db_base_test.h
@@ -59,7 +59,7 @@
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// names of the database files
base::FilePath history_dir_;
diff --git a/components/image_fetcher/core/cache/image_cache_unittest.cc b/components/image_fetcher/core/cache/image_cache_unittest.cc
index 19347e2..b2564338d 100644
--- a/components/image_fetcher/core/cache/image_cache_unittest.cc
+++ b/components/image_fetcher/core/cache/image_cache_unittest.cc
@@ -171,7 +171,7 @@
FakeDB<CachedImageMetadataProto>* db_;
std::map<std::string, CachedImageMetadataProto> db_store_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(CachedImageFetcherImageCacheTest);
diff --git a/components/image_fetcher/core/cache/image_data_store_disk_unittest.cc b/components/image_fetcher/core/cache/image_data_store_disk_unittest.cc
index fecf8bb1..524d9282 100644
--- a/components/image_fetcher/core/cache/image_data_store_disk_unittest.cc
+++ b/components/image_fetcher/core/cache/image_data_store_disk_unittest.cc
@@ -92,7 +92,7 @@
ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(CachedImageFetcherImageDataStoreDiskTest);
};
diff --git a/components/image_fetcher/core/cache/image_metadata_store_leveldb_unittest.cc b/components/image_fetcher/core/cache/image_metadata_store_leveldb_unittest.cc
index 402bb75c..97c9d3e 100644
--- a/components/image_fetcher/core/cache/image_metadata_store_leveldb_unittest.cc
+++ b/components/image_fetcher/core/cache/image_metadata_store_leveldb_unittest.cc
@@ -119,7 +119,7 @@
ASSERT_EQ(entry.needs_transcoding(), needs_transcoding);
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
base::SimpleTestClock* clock() { return clock_.get(); }
ImageMetadataStore* metadata_store() { return metadata_store_.get(); }
FakeDB<CachedImageMetadataProto>* db() { return db_; }
@@ -136,7 +136,7 @@
std::map<std::string, CachedImageMetadataProto> db_store_;
std::unique_ptr<ImageMetadataStoreLevelDB> metadata_store_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(CachedImageFetcherImageMetadataStoreLevelDBTest);
};
diff --git a/components/image_fetcher/core/cached_image_fetcher_unittest.cc b/components/image_fetcher/core/cached_image_fetcher_unittest.cc
index 2323f8bd5..8fa05ad 100644
--- a/components/image_fetcher/core/cached_image_fetcher_unittest.cc
+++ b/components/image_fetcher/core/cached_image_fetcher_unittest.cc
@@ -113,7 +113,7 @@
RunUntilIdle();
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
CachedImageFetcher* cached_image_fetcher() {
return cached_image_fetcher_.get();
@@ -142,7 +142,7 @@
FakeDB<CachedImageMetadataProto>* db_;
std::map<std::string, CachedImageMetadataProto> metadata_store_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(CachedImageFetcherTest);
diff --git a/components/image_fetcher/core/image_data_fetcher_unittest.cc b/components/image_fetcher/core/image_data_fetcher_unittest.cc
index b2905c4..ef2724e 100644
--- a/components/image_fetcher/core/image_data_fetcher_unittest.cc
+++ b/components/image_fetcher/core/image_data_fetcher_unittest.cc
@@ -53,7 +53,7 @@
void(const std::string&, const RequestMetadata&));
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
diff --git a/components/image_fetcher/core/image_fetcher_impl_unittest.cc b/components/image_fetcher/core/image_fetcher_impl_unittest.cc
index 61ad10c..f6e48b8 100644
--- a/components/image_fetcher/core/image_fetcher_impl_unittest.cc
+++ b/components/image_fetcher/core/image_fetcher_impl_unittest.cc
@@ -48,7 +48,7 @@
std::move(decoder), shared_factory_);
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
FakeImageDecoder* image_decoder() { return fake_image_decoder_; }
network::TestURLLoaderFactory* test_url_loader_factory() {
@@ -61,7 +61,7 @@
FakeImageDecoder* fake_image_decoder_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ImageFetcherImplTest);
};
diff --git a/components/image_fetcher/core/reduced_mode_image_fetcher_unittest.cc b/components/image_fetcher/core/reduced_mode_image_fetcher_unittest.cc
index ba0242b6..0ffd891 100644
--- a/components/image_fetcher/core/reduced_mode_image_fetcher_unittest.cc
+++ b/components/image_fetcher/core/reduced_mode_image_fetcher_unittest.cc
@@ -106,7 +106,7 @@
RunUntilIdle();
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
void VerifyCacheHit() {
RunUntilIdle();
@@ -152,7 +152,7 @@
FakeDB<CachedImageMetadataProto>* db_;
std::map<std::string, CachedImageMetadataProto> metadata_store_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
DISALLOW_COPY_AND_ASSIGN(ReducedModeImageFetcherTest);
diff --git a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
index 1f8bcb2..6794d244 100644
--- a/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
+++ b/components/image_fetcher/ios/ios_image_data_fetcher_wrapper_unittest.mm
@@ -125,7 +125,7 @@
}
// Message loop for the main test thread.
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
base::mac::ScopedBlock<ImageDataFetcherBlock> callback_;
network::TestURLLoaderFactory factory_;
diff --git a/components/image_fetcher/ios/ios_image_decoder_impl_unittest.mm b/components/image_fetcher/ios/ios_image_decoder_impl_unittest.mm
index 278e1bb..e0895b0 100644
--- a/components/image_fetcher/ios/ios_image_decoder_impl_unittest.mm
+++ b/components/image_fetcher/ios/ios_image_decoder_impl_unittest.mm
@@ -65,7 +65,7 @@
~IOSImageDecoderImplTest() override {}
- base::test::ScopedTaskEnvironment scoped_task_evironment_;
+ base::test::TaskEnvironment scoped_task_evironment_;
std::unique_ptr<ImageDecoder> ios_image_decoder_impl_;
gfx::Image decoded_image_;
diff --git a/components/invalidation/impl/fcm_invalidation_listener_unittest.cc b/components/invalidation/impl/fcm_invalidation_listener_unittest.cc
index 54d1cac4..69700d1 100644
--- a/components/invalidation/impl/fcm_invalidation_listener_unittest.cc
+++ b/components/invalidation/impl/fcm_invalidation_listener_unittest.cc
@@ -284,7 +284,7 @@
Topics registred_topics_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
FCMSyncNetworkChannel* fcm_sync_network_channel_;
MockRegistrationManager* registration_manager_;
diff --git a/components/invalidation/impl/fcm_invalidation_service_unittest.cc b/components/invalidation/impl/fcm_invalidation_service_unittest.cc
index 0d50ec4..0b049c2 100644
--- a/components/invalidation/impl/fcm_invalidation_service_unittest.cc
+++ b/components/invalidation/impl/fcm_invalidation_service_unittest.cc
@@ -202,7 +202,7 @@
ConvertObjectIdInvalidationMapToTopicInvalidationMap(invalidation_map));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
std::unique_ptr<gcm::GCMDriver> gcm_driver_;
std::unique_ptr<MockInstanceIDDriver> mock_instance_id_driver_;
diff --git a/components/invalidation/impl/fcm_network_handler_unittests.cc b/components/invalidation/impl/fcm_network_handler_unittests.cc
index 443850d..7a0349e 100644
--- a/components/invalidation/impl/fcm_network_handler_unittests.cc
+++ b/components/invalidation/impl/fcm_network_handler_unittests.cc
@@ -280,7 +280,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<StrictMock<MockGCMDriver>> mock_gcm_driver_;
std::unique_ptr<StrictMock<MockInstanceIDDriver>> mock_instance_id_driver_;
std::unique_ptr<StrictMock<MockInstanceID>> mock_instance_id_;
diff --git a/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc b/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc
index cfb1d7e..a008a3bb 100644
--- a/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc
+++ b/components/invalidation/impl/gcm_invalidation_bridge_unittest.cc
@@ -98,7 +98,7 @@
connection_online_ = online;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
signin::IdentityTestEnvironment identity_test_env_;
std::unique_ptr<gcm::GCMDriver> gcm_driver_;
std::unique_ptr<ProfileIdentityProvider> identity_provider_;
diff --git a/components/invalidation/impl/gcm_network_channel_unittest.cc b/components/invalidation/impl/gcm_network_channel_unittest.cc
index 13e2c554..d05205e 100644
--- a/components/invalidation/impl/gcm_network_channel_unittest.cc
+++ b/components/invalidation/impl/gcm_network_channel_unittest.cc
@@ -189,7 +189,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestGCMNetworkChannelDelegate* delegate_;
std::unique_ptr<GCMNetworkChannel> gcm_network_channel_;
int network_request_count_;
diff --git a/components/invalidation/impl/invalidation_notifier_unittest.cc b/components/invalidation/impl/invalidation_notifier_unittest.cc
index 942cde8f..09ad397 100644
--- a/components/invalidation/impl/invalidation_notifier_unittest.cc
+++ b/components/invalidation/impl/invalidation_notifier_unittest.cc
@@ -75,7 +75,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<InvalidationNotifier> invalidator_;
};
diff --git a/components/invalidation/impl/non_blocking_invalidator_unittest.cc b/components/invalidation/impl/non_blocking_invalidator_unittest.cc
index f5530d0..04a982cc 100644
--- a/components/invalidation/impl/non_blocking_invalidator_unittest.cc
+++ b/components/invalidation/impl/non_blocking_invalidator_unittest.cc
@@ -87,7 +87,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread io_thread_;
std::unique_ptr<jingle_glue::NetworkServiceConfigTestUtil> net_config_helper_;
std::unique_ptr<NonBlockingInvalidator> invalidator_;
diff --git a/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc b/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc
index 7b270ca..3eabc1ec 100644
--- a/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc
+++ b/components/invalidation/impl/per_user_topic_registration_manager_unittest.cc
@@ -182,7 +182,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
network::TestURLLoaderFactory url_loader_factory_;
TestingPrefServiceSimple pref_service_;
diff --git a/components/invalidation/impl/per_user_topic_registration_request_unittest.cc b/components/invalidation/impl/per_user_topic_registration_request_unittest.cc
index 91306258..06596736 100644
--- a/components/invalidation/impl/per_user_topic_registration_request_unittest.cc
+++ b/components/invalidation/impl/per_user_topic_registration_request_unittest.cc
@@ -74,7 +74,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
network::TestURLLoaderFactory url_loader_factory_;
diff --git a/components/invalidation/impl/registration_manager_unittest.cc b/components/invalidation/impl/registration_manager_unittest.cc
index 6129b4e7..ba0bfb2c 100644
--- a/components/invalidation/impl/registration_manager_unittest.cc
+++ b/components/invalidation/impl/registration_manager_unittest.cc
@@ -223,7 +223,7 @@
private:
// Needed by timers in RegistrationManager.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(RegistrationManagerTest);
};
diff --git a/components/invalidation/impl/sync_invalidation_listener_unittest.cc b/components/invalidation/impl/sync_invalidation_listener_unittest.cc
index dac233cb..b76cb7120 100644
--- a/components/invalidation/impl/sync_invalidation_listener_unittest.cc
+++ b/components/invalidation/impl/sync_invalidation_listener_unittest.cc
@@ -445,7 +445,7 @@
ObjectIdSet registered_ids_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
notifier::FakePushClient* const fake_push_client_;
protected:
diff --git a/components/invalidation/impl/sync_system_resources_unittest.cc b/components/invalidation/impl/sync_system_resources_unittest.cc
index 799dc00..aee59db 100644
--- a/components/invalidation/impl/sync_system_resources_unittest.cc
+++ b/components/invalidation/impl/sync_system_resources_unittest.cc
@@ -85,7 +85,7 @@
}
// Needed by |sync_system_resources_|.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockStateWriter mock_state_writer_;
PushClientChannel push_client_channel_;
SyncSystemResources sync_system_resources_;
diff --git a/components/invalidation/impl/ticl_invalidation_service_unittest.cc b/components/invalidation/impl/ticl_invalidation_service_unittest.cc
index 03223d2..d1ca6f88 100644
--- a/components/invalidation/impl/ticl_invalidation_service_unittest.cc
+++ b/components/invalidation/impl/ticl_invalidation_service_unittest.cc
@@ -79,7 +79,7 @@
fake_invalidator_->EmitOnIncomingInvalidation(invalidation_map);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
signin::IdentityTestEnvironment identity_test_env_;
std::unique_ptr<gcm::GCMDriver> gcm_driver_;
std::unique_ptr<invalidation::IdentityProvider> identity_provider_;
diff --git a/components/language/content/browser/geo_language_model_unittest.cc b/components/language/content/browser/geo_language_model_unittest.cc
index 36230f8..85f301ca 100644
--- a/components/language/content/browser/geo_language_model_unittest.cc
+++ b/components/language/content/browser/geo_language_model_unittest.cc
@@ -30,8 +30,7 @@
class GeoLanguageModelTest : public testing::Test {
public:
GeoLanguageModelTest()
- : geo_language_provider_(
- scoped_task_environment_.GetMainThreadTaskRunner()),
+ : geo_language_provider_(task_environment_.GetMainThreadTaskRunner()),
geo_language_model_(&geo_language_provider_),
mock_ip_geo_location_provider_(&mock_geo_location_) {
service_manager::mojom::ConnectorRequest request;
@@ -58,8 +57,8 @@
GeoLanguageModel* language_model() { return &geo_language_model_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
private:
GeoLanguageProvider geo_language_provider_;
@@ -75,7 +74,7 @@
// Setup a random place in Madhya Pradesh, India.
MoveToLocation(23.0, 80.0);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(language_model()->GetLanguages(),
testing::ElementsAre(
@@ -87,7 +86,7 @@
// Setup a random place outside of India.
MoveToLocation(45.5, 73.5);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0UL, language_model()->GetLanguages().size());
}
diff --git a/components/language/content/browser/geo_language_provider_unittest.cc b/components/language/content/browser/geo_language_provider_unittest.cc
index a006532..267e918 100644
--- a/components/language/content/browser/geo_language_provider_unittest.cc
+++ b/components/language/content/browser/geo_language_provider_unittest.cc
@@ -25,8 +25,7 @@
class GeoLanguageProviderTest : public testing::Test {
public:
GeoLanguageProviderTest()
- : geo_language_provider_(
- scoped_task_environment_.GetMainThreadTaskRunner()),
+ : geo_language_provider_(task_environment_.GetMainThreadTaskRunner()),
mock_ip_geo_location_provider_(&mock_geo_location_) {
service_manager::mojom::ConnectorRequest request;
connector_ = service_manager::Connector::Create(&request);
@@ -81,8 +80,8 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
private:
// Object under test.
@@ -97,7 +96,7 @@
// Setup a random place in West Bengal, India.
MoveToLocation(23.0, 85.7);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::vector<std::string> expected_langs = {"hi", "bn", "en"};
EXPECT_EQ(expected_langs, GetCurrentGeoLanguages());
@@ -107,7 +106,7 @@
// Setup a random place in Montreal, Canada.
MoveToLocation(45.5, 73.5);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::vector<std::string> expected_langs = {};
EXPECT_EQ(expected_langs, GetCurrentGeoLanguages());
@@ -117,13 +116,13 @@
// Setup a random place in Madhya Pradesh, India.
MoveToLocation(23.0, 80.0);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const std::vector<std::string>& result = GetCurrentGeoLanguages();
std::vector<std::string> expected_langs = {"hi", "en"};
EXPECT_EQ(expected_langs, result);
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromHours(12));
+ task_environment_.FastForwardBy(base::TimeDelta::FromHours(12));
EXPECT_EQ(1, GetQueryNextPositionCalledTimes());
EXPECT_EQ(expected_langs, GetCachedLanguages());
}
@@ -132,7 +131,7 @@
// Setup a random place in Madhya Pradesh, India.
MoveToLocation(23.0, 80.0);
StartGeoLanguageProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::vector<std::string> result = GetCurrentGeoLanguages();
std::vector<std::string> expected_langs = {"hi", "en"};
@@ -141,7 +140,7 @@
// Move to another random place in Karnataka, India.
MoveToLocation(23.0, 85.7);
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromHours(25));
+ task_environment_.FastForwardBy(base::TimeDelta::FromHours(25));
EXPECT_EQ(2, GetQueryNextPositionCalledTimes());
result = GetCurrentGeoLanguages();
@@ -158,7 +157,7 @@
std::vector<std::string> expected_langs = {"en", "fr"};
EXPECT_EQ(expected_langs, GetCurrentGeoLanguages());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
expected_langs = {"hi", "en"};
EXPECT_EQ(expected_langs, GetCurrentGeoLanguages());
diff --git a/components/leveldb_proto/internal/proto_database_impl_unittest.cc b/components/leveldb_proto/internal/proto_database_impl_unittest.cc
index 98ce3ea..2ee3c43 100644
--- a/components/leveldb_proto/internal/proto_database_impl_unittest.cc
+++ b/components/leveldb_proto/internal/proto_database_impl_unittest.cc
@@ -394,7 +394,7 @@
private:
std::unique_ptr<base::ScopedTempDir> temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::test::ScopedFeatureList scoped_feature_list_;
// Shared database.
diff --git a/components/leveldb_proto/internal/shared_proto_database_client_unittest.cc b/components/leveldb_proto/internal/shared_proto_database_client_unittest.cc
index d89e912..957c9326 100644
--- a/components/leveldb_proto/internal/shared_proto_database_client_unittest.cc
+++ b/components/leveldb_proto/internal/shared_proto_database_client_unittest.cc
@@ -289,7 +289,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<SharedProtoDatabase> db_;
std::unique_ptr<base::ScopedTempDir> temp_dir_;
@@ -670,4 +670,4 @@
SharedDBMetadataProto::MIGRATION_NOT_ATTEMPTED);
}
-} // namespace leveldb_proto
\ No newline at end of file
+} // namespace leveldb_proto
diff --git a/components/leveldb_proto/internal/shared_proto_database_unittest.cc b/components/leveldb_proto/internal/shared_proto_database_unittest.cc
index e2a59649..cd6b16d 100644
--- a/components/leveldb_proto/internal/shared_proto_database_unittest.cc
+++ b/components/leveldb_proto/internal/shared_proto_database_unittest.cc
@@ -53,7 +53,7 @@
FROM_HERE,
base::BindOnce(&SharedProtoDatabase::Init, db_, create_if_missing,
client_name, std::move(callback),
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
}
void KillDB() { db_.reset(); }
@@ -85,14 +85,14 @@
}
scoped_refptr<base::SequencedTaskRunner> GetMainThreadTaskRunner() {
- return scoped_task_environment_.GetMainThreadTaskRunner();
+ return task_environment_.GetMainThreadTaskRunner();
}
SharedProtoDatabase* db() { return db_.get(); }
ProtoLevelDBWrapper* wrapper() { return db_->db_wrapper_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::ScopedTempDir> temp_dir_;
scoped_refptr<SharedProtoDatabase> db_;
diff --git a/components/leveldb_proto/internal/unique_proto_database_unittest.cc b/components/leveldb_proto/internal/unique_proto_database_unittest.cc
index 71dcb9c7..9ba27e6c 100644
--- a/components/leveldb_proto/internal/unique_proto_database_unittest.cc
+++ b/components/leveldb_proto/internal/unique_proto_database_unittest.cc
@@ -30,7 +30,7 @@
#include "third_party/leveldatabase/leveldb_chrome.h"
using base::ScopedTempDir;
-using base::test::ScopedTaskEnvironment;
+using base::test::TaskEnvironment;
using leveldb_env::Options;
using testing::_;
using testing::Invoke;
@@ -231,7 +231,7 @@
}
const Matcher<const Options&> options_;
- ScopedTaskEnvironment task_environment_;
+ TaskEnvironment task_environment_;
std::unique_ptr<ProtoDatabaseImpl<TestProto>> db_;
};
@@ -561,7 +561,7 @@
void TearDown() override { base::RunLoop().RunUntilIdle(); }
private:
- ScopedTaskEnvironment scoped_task_environment_;
+ TaskEnvironment task_environment_;
};
TEST_F(UniqueProtoDatabaseLevelDBTest, TestDBSaveAndLoadKeys) {
@@ -793,7 +793,7 @@
// This tests that normal usage of the real database does not cause any
// threading violations.
TEST(UniqueProtoDatabaseThreadingTest, TestDBDestruction) {
- ScopedTaskEnvironment scoped_task_environment;
+ TaskEnvironment task_environment;
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -827,7 +827,7 @@
// This tests that normal usage of the real database does not cause any
// threading violations.
TEST(UniqueProtoDatabaseThreadingTest, TestDBDestroy) {
- ScopedTaskEnvironment scoped_task_environment;
+ TaskEnvironment task_environment;
ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
diff --git a/components/media_message_center/media_controls_progress_view_unittest.cc b/components/media_message_center/media_controls_progress_view_unittest.cc
index 0caf91c..ecab850c 100644
--- a/components/media_message_center/media_controls_progress_view_unittest.cc
+++ b/components/media_message_center/media_controls_progress_view_unittest.cc
@@ -19,7 +19,7 @@
public:
MediaControlsProgressViewTest()
: views::ViewsTestBase(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
~MediaControlsProgressViewTest() override = default;
// ViewsTestBase:
@@ -110,8 +110,8 @@
base::ASCIIToUTF16("05:00"));
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(progress_view_->duration_for_testing(),
base::ASCIIToUTF16("10:00"));
@@ -133,8 +133,8 @@
base::ASCIIToUTF16("05:00"));
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(15));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(15));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(progress_view_->duration_for_testing(),
base::ASCIIToUTF16("10:00"));
@@ -156,8 +156,8 @@
base::ASCIIToUTF16("05:00"));
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(60));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(60));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(progress_view_->duration_for_testing(),
base::ASCIIToUTF16("10:00"));
@@ -179,8 +179,8 @@
base::ASCIIToUTF16("05:00"));
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(progress_view_->duration_for_testing(),
base::ASCIIToUTF16("10:00"));
@@ -203,8 +203,8 @@
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
// Move forward in time past the duration.
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
+ task_environment_->RunUntilIdle();
// Verify the progress does not go past the duration.
EXPECT_EQ(progress_view_->duration_for_testing(),
@@ -228,8 +228,8 @@
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
// Move forward in time before the start using negative playback rate.
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
+ task_environment_->RunUntilIdle();
// Verify the progress does not go below 0.
EXPECT_EQ(progress_view_->duration_for_testing(),
@@ -252,8 +252,8 @@
base::ASCIIToUTF16("05:00"));
EXPECT_EQ(progress_view_->progress_bar_for_testing()->current_value(), .5);
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(6));
+ task_environment_->RunUntilIdle();
// Verify the progress does not change while media is paused.
EXPECT_EQ(progress_view_->duration_for_testing(),
diff --git a/components/metrics/child_call_stack_profile_collector_unittest.cc b/components/metrics/child_call_stack_profile_collector_unittest.cc
index 84f33bb..732323b 100644
--- a/components/metrics/child_call_stack_profile_collector_unittest.cc
+++ b/components/metrics/child_call_stack_profile_collector_unittest.cc
@@ -50,7 +50,7 @@
return child_collector_.profiles_;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojom::CallStackProfileCollectorPtr receiver_;
std::unique_ptr<Receiver> receiver_impl_;
ChildCallStackProfileCollector child_collector_;
diff --git a/components/metrics/net/net_metrics_log_uploader_unittest.cc b/components/metrics/net/net_metrics_log_uploader_unittest.cc
index 484f490..ec8283f 100644
--- a/components/metrics/net/net_metrics_log_uploader_unittest.cc
+++ b/components/metrics/net/net_metrics_log_uploader_unittest.cc
@@ -113,7 +113,7 @@
scoped_refptr<network::SharedURLLoaderFactory>
test_shared_url_loader_factory_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop loop_;
std::string upload_data_;
diff --git a/components/metrics/single_sample_metrics_factory_impl_unittest.cc b/components/metrics/single_sample_metrics_factory_impl_unittest.cc
index a14d23f..b1d62a1 100644
--- a/components/metrics/single_sample_metrics_factory_impl_unittest.cc
+++ b/components/metrics/single_sample_metrics_factory_impl_unittest.cc
@@ -75,7 +75,7 @@
kBucketCount);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
SingleSampleMetricsFactoryImpl* factory_;
base::Thread thread_;
size_t provider_count_ = 0;
diff --git a/components/mirroring/browser/single_client_video_capture_host_unittest.cc b/components/mirroring/browser/single_client_video_capture_host_unittest.cc
index 826667ee..e0555576 100644
--- a/components/mirroring/browser/single_client_video_capture_host_unittest.cc
+++ b/components/mirroring/browser/single_client_video_capture_host_unittest.cc
@@ -242,7 +242,7 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockVideoCaptureObserver> consumer_;
base::WeakPtr<VideoFrameReceiver> frame_receiver_;
MockVideoCaptureDevice* launched_device_ = nullptr;
@@ -280,7 +280,7 @@
{
EXPECT_CALL(*consumer_, OnBufferDestroyedCall(0)).Times(0);
frame_receiver_->OnBufferRetired(0);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Re-use buffer 0.
diff --git a/components/mirroring/service/captured_audio_input_unittest.cc b/components/mirroring/service/captured_audio_input_unittest.cc
index 060c14b75..02d3936 100644
--- a/components/mirroring/service/captured_audio_input_unittest.cc
+++ b/components/mirroring/service/captured_audio_input_unittest.cc
@@ -51,9 +51,7 @@
public:
CapturedAudioInputTest() {}
- ~CapturedAudioInputTest() override {
- scoped_task_environment_.RunUntilIdle();
- }
+ ~CapturedAudioInputTest() override { task_environment_.RunUntilIdle(); }
void CreateMockStream(bool initially_muted,
mojom::AudioStreamCreatorClientPtr client,
@@ -91,7 +89,7 @@
void CloseStream() {
EXPECT_TRUE(audio_input_);
audio_input_->CloseStream();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
socket_.Close();
audio_input_.reset();
stream_ = nullptr;
@@ -134,7 +132,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<media::AudioInputIPC> audio_input_;
MockDelegate delegate_;
MockStream* stream_ = nullptr;
diff --git a/components/mirroring/service/media_remoter_unittest.cc b/components/mirroring/service/media_remoter_unittest.cc
index 4d58946..e7ceff60 100644
--- a/components/mirroring/service/media_remoter_unittest.cc
+++ b/components/mirroring/service/media_remoter_unittest.cc
@@ -74,7 +74,7 @@
mojo::MakeRequest(&inbound_channel_),
error_callback_.Get()),
sink_metadata_(DefaultSinkMetadata()) {}
- ~MediaRemoterTest() override { scoped_task_environment_.RunUntilIdle(); }
+ ~MediaRemoterTest() override { task_environment_.RunUntilIdle(); }
protected:
MOCK_METHOD1(Send, void(mojom::CastMessagePtr));
@@ -97,7 +97,7 @@
EXPECT_CALL(remoting_source_, OnSinkAvailable(_)).Times(1);
media_remoter_ = std::make_unique<MediaRemoter>(this, sink_metadata_,
&message_dispatcher_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
@@ -107,7 +107,7 @@
ASSERT_TRUE(remoter_);
EXPECT_CALL(*this, RequestRemotingStreaming()).Times(1);
remoter_->Start();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
}
@@ -119,7 +119,7 @@
EXPECT_CALL(remoting_source_, OnSinkGone()).Times(1);
EXPECT_CALL(*this, RestartMirroringStreaming()).Times(1);
remoter_->Stop(media::mojom::RemotingStopReason::USER_DISABLED);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
@@ -130,15 +130,15 @@
scoped_refptr<media::cast::CastEnvironment> cast_environment =
new media::cast::CastEnvironment(
base::DefaultTickClock::GetInstance(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner());
EXPECT_CALL(remoting_source_, OnStarted()).Times(1);
media_remoter_->StartRpcMessaging(
cast_environment, nullptr, media::cast::FrameSenderConfig(),
MirrorSettings::GetDefaultVideoConfig(RtpPayloadType::REMOTE_VIDEO,
Codec::CODEC_VIDEO_REMOTE));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(&remoting_source_);
}
@@ -146,7 +146,7 @@
void MirroringResumed() {
EXPECT_CALL(remoting_source_, OnSinkAvailable(_)).Times(1);
media_remoter_->OnMirroringResumed();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(&remoting_source_);
}
@@ -157,7 +157,7 @@
EXPECT_CALL(remoting_source_, OnSinkGone()).Times(1);
EXPECT_CALL(*this, RestartMirroringStreaming()).Times(1);
media_remoter_->OnRemotingFailed();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
@@ -169,7 +169,7 @@
return outbound_channel_ptr;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Binding<mojom::CastMessageChannel> binding_;
base::MockCallback<MessageDispatcher::ErrorCallback> error_callback_;
mojom::CastMessageChannelPtr inbound_channel_;
diff --git a/components/mirroring/service/message_dispatcher_unittest.cc b/components/mirroring/service/message_dispatcher_unittest.cc
index 62c19d6..ff8f904 100644
--- a/components/mirroring/service/message_dispatcher_unittest.cc
+++ b/components/mirroring/service/message_dispatcher_unittest.cc
@@ -73,7 +73,7 @@
base::BindRepeating(&MessageDispatcherTest::OnStatusResponse,
base::Unretained(this)));
}
- ~MessageDispatcherTest() override { scoped_task_environment_.RunUntilIdle(); }
+ ~MessageDispatcherTest() override { task_environment_.RunUntilIdle(); }
void OnParsingError(const std::string& error_message) {
last_error_message_ = error_message;
@@ -103,7 +103,7 @@
inbound_channel_->Send(message.Clone());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MessageDispatcher> message_dispatcher_;
CastMessage last_outbound_message_;
std::string last_error_message_;
@@ -120,14 +120,14 @@
const std::string test1 = "{\"a\": 1, \"b\": 2}";
const CastMessage message1 = CastMessage{mojom::kWebRtcNamespace, test1};
message_dispatcher_->SendOutboundMessage(message1.Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsEqual(message1, last_outbound_message_));
EXPECT_TRUE(last_error_message_.empty());
const std::string test2 = "{\"m\": 99, \"i\": 98, \"u\": 97}";
const CastMessage message2 = CastMessage{mojom::kWebRtcNamespace, test2};
message_dispatcher_->SendOutboundMessage(message2.Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsEqual(message2, last_outbound_message_));
EXPECT_TRUE(last_error_message_.empty());
}
@@ -141,7 +141,7 @@
const CastMessage answer_message =
CastMessage{mojom::kWebRtcNamespace, answer_response};
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_EQ(12345, last_answer_response_->sequence_number);
@@ -160,7 +160,7 @@
const CastMessage status_message =
CastMessage{mojom::kWebRtcNamespace, status_response};
SendInboundMessage(status_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
ASSERT_TRUE(last_status_response_);
EXPECT_EQ(12345, last_status_response_->sequence_number);
@@ -174,7 +174,7 @@
// nothing should happen.
message_dispatcher_->Unsubscribe(ResponseType::ANSWER);
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_FALSE(last_error_message_.empty()); // Expect an error reported.
@@ -183,7 +183,7 @@
// However, STATUS_RESPONSE messages should still be dispatcher to the
// remaining subscriber.
SendInboundMessage(status_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_TRUE(last_status_response_);
last_status_response_.reset();
@@ -193,13 +193,13 @@
// either an ANSWER or a STATUS_RESPONSE message, nothing should happen.
message_dispatcher_->Unsubscribe(ResponseType::STATUS_RESPONSE);
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_FALSE(last_error_message_.empty());
last_error_message_.clear();
SendInboundMessage(status_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_FALSE(last_error_message_.empty());
@@ -209,7 +209,7 @@
const CastMessage message =
CastMessage{mojom::kWebRtcNamespace, "MUAHAHAHAHAHAHAHA!"};
SendInboundMessage(message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_FALSE(last_error_message_.empty());
@@ -222,7 +222,7 @@
const CastMessage answer_message =
CastMessage{"Wrong_namespace", answer_response};
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
// Messages with different namespace are ignored with no error reported.
@@ -233,7 +233,7 @@
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
message_dispatcher_->Unsubscribe(ResponseType::ANSWER);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const std::string fake_offer = "{\"type\":\"OFFER\",\"seqNum\":45623}";
const CastMessage offer_message =
CastMessage{mojom::kWebRtcNamespace, fake_offer};
@@ -242,7 +242,7 @@
base::TimeDelta::FromMilliseconds(100),
base::BindRepeating(&MessageDispatcherTest::OnAnswerResponse,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Received the request to send the outbound message.
EXPECT_TRUE(IsEqual(offer_message, last_outbound_message_));
@@ -252,7 +252,7 @@
CastMessage answer_message =
CastMessage{mojom::kWebRtcNamespace, answer_response};
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The answer message with mismatched sequence number is ignored.
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
@@ -263,7 +263,7 @@
"\"answer\":{\"udpPort\":50691}}";
answer_message = CastMessage{mojom::kWebRtcNamespace, answer_response};
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_TRUE(last_error_message_.empty());
@@ -275,7 +275,7 @@
// Expect that the callback for ANSWER message was already unsubscribed.
SendInboundMessage(answer_message);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
EXPECT_FALSE(last_error_message_.empty());
@@ -288,7 +288,7 @@
base::TimeDelta::FromMilliseconds(100),
base::BindRepeating(&MessageDispatcherTest::OnAnswerResponse,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Received the request to send the outbound message.
EXPECT_TRUE(IsEqual(fake_message, last_outbound_message_));
EXPECT_FALSE(last_answer_response_);
@@ -296,7 +296,7 @@
// Destroy the dispatcher.
message_dispatcher_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_FALSE(last_answer_response_);
EXPECT_FALSE(last_status_response_);
}
diff --git a/components/mirroring/service/remoting_sender_unittest.cc b/components/mirroring/service/remoting_sender_unittest.cc
index 2dab6e4..5ec6bcc9 100644
--- a/components/mirroring/service/remoting_sender_unittest.cc
+++ b/components/mirroring/service/remoting_sender_unittest.cc
@@ -107,9 +107,9 @@
RemotingSenderTest()
: cast_environment_(new media::cast::CastEnvironment(
base::DefaultTickClock::GetInstance(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner())),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner())),
expecting_error_callback_run_(false),
receiver_ssrc_(-1) {
const MojoCreateDataPipeOptions data_pipe_options{
@@ -150,7 +150,7 @@
}
// Allow pending tasks, such as Mojo method calls, to execute.
- void RunPendingTasks() { scoped_task_environment_.RunUntilIdle(); }
+ void RunPendingTasks() { task_environment_.RunUntilIdle(); }
protected:
media::cast::FrameId latest_acked_frame_id() const {
@@ -250,7 +250,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const scoped_refptr<media::cast::CastEnvironment> cast_environment_;
FakeTransport transport_;
std::unique_ptr<RemotingSender> remoting_sender_;
diff --git a/components/mirroring/service/rtp_stream_unittest.cc b/components/mirroring/service/rtp_stream_unittest.cc
index b3b9bbe..098e87b0 100644
--- a/components/mirroring/service/rtp_stream_unittest.cc
+++ b/components/mirroring/service/rtp_stream_unittest.cc
@@ -61,16 +61,16 @@
RtpStreamTest()
: cast_environment_(new media::cast::CastEnvironment(
&testing_clock_,
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner())) {
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner())) {
testing_clock_.Advance(base::TimeTicks::Now() - base::TimeTicks());
}
- ~RtpStreamTest() override { scoped_task_environment_.RunUntilIdle(); }
+ ~RtpStreamTest() override { task_environment_.RunUntilIdle(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::SimpleTestTickClock testing_clock_;
const scoped_refptr<media::cast::CastEnvironment> cast_environment_;
DummyClient client_;
@@ -105,7 +105,7 @@
run_loop.Run();
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Test the audio streaming pipeline.
@@ -131,7 +131,7 @@
run_loop.Run();
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
} // namespace mirroring
diff --git a/components/mirroring/service/session_monitor_unittest.cc b/components/mirroring/service/session_monitor_unittest.cc
index 29fcd700..9b21602 100644
--- a/components/mirroring/service/session_monitor_unittest.cc
+++ b/components/mirroring/service/session_monitor_unittest.cc
@@ -142,37 +142,37 @@
"\"wifiFcsError\": [12, 13, 12, 12]}" // This will be ignored.
"}";
inbound_channel_->Send(message.Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
void StartStreamingSession() {
cast_environment_ = new media::cast::CastEnvironment(
base::DefaultTickClock::GetInstance(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner());
EXPECT_TRUE(session_monitor_);
auto wifi_status_monitor =
std::make_unique<WifiStatusMonitor>(&message_dispatcher_);
session_monitor_->StartStreamingSession(
cast_environment_, std::move(wifi_status_monitor),
SessionMonitor::AUDIO_AND_VIDEO, false /* is_remoting */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void StopStreamingSession() {
EXPECT_TRUE(session_monitor_);
session_monitor_->StopStreamingSession();
cast_environment_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
std::vector<SessionMonitor::EventsAndStats> AssembleBundleAndVerify(
const std::vector<int32_t>& bundle_sizes) {
std::vector<SessionMonitor::EventsAndStats> bundles =
session_monitor_->AssembleBundlesAndClear(bundle_sizes);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(bundle_sizes.size(), bundles.size());
for (size_t i = 0; i < bundles.size(); ++i) {
EXPECT_FALSE(bundles[i].first.empty());
@@ -197,19 +197,19 @@
url_loader_factory_->AddResponse(
"http://" + receiver_address_.ToString() + ":8008/setup/eureka_info",
setup_info);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void TakeSnapshot() {
ASSERT_TRUE(session_monitor_);
session_monitor_->TakeSnapshot();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void ReportError(SessionError error) {
ASSERT_TRUE(session_monitor_);
session_monitor_->OnStreamingError(error);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
private:
@@ -219,7 +219,7 @@
return outbound_channel_ptr;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const net::IPAddress receiver_address_;
mojo::Binding<mojom::CastMessageChannel> binding_;
mojom::CastMessageChannelPtr inbound_channel_;
diff --git a/components/mirroring/service/session_unittest.cc b/components/mirroring/service/session_unittest.cc
index a256406d..ebb5aa3 100644
--- a/components/mirroring/service/session_unittest.cc
+++ b/components/mirroring/service/session_unittest.cc
@@ -78,7 +78,7 @@
session_observer_binding_(this),
outbound_channel_binding_(this) {}
- ~SessionTest() override { scoped_task_environment_.RunUntilIdle(); }
+ ~SessionTest() override { task_environment_.RunUntilIdle(); }
protected:
// mojom::SessionObserver implemenation.
@@ -185,7 +185,7 @@
response.answer = std::move(answer);
session_->OnAnswer(audio_configs, video_configs, response);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Create a mirroring session. Expect to send OFFER message.
@@ -212,7 +212,7 @@
std::move(session_observer_ptr), std::move(resource_provider_ptr),
std::move(outbound_channel_ptr), mojo::MakeRequest(&inbound_channel_),
nullptr);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
}
@@ -231,7 +231,7 @@
EXPECT_CALL(*this, OnOutboundMessage("GET_CAPABILITIES")).Times(1);
EXPECT_CALL(*this, DidStart()).Times(1);
SendAnswer();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
}
@@ -240,7 +240,7 @@
EXPECT_CALL(*video_host_, OnStopped()).Times(1);
EXPECT_CALL(*this, DidStop()).Times(1);
session_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
}
@@ -252,7 +252,7 @@
EXPECT_CALL(*video_host_, ReleaseBuffer(_, _, _)).Times(1);
// Send one video frame to the consumer.
video_host_->SendOneFrame(gfx::Size(64, 32), base::TimeTicks::Now());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(network_context_.get());
Mock::VerifyAndClear(video_host_.get());
}
@@ -274,7 +274,7 @@
}
session_->OnAnswer(std::vector<FrameSenderConfig>(),
std::vector<FrameSenderConfig>(), ReceiverResponse());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
cast_mode_ = "mirroring";
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
@@ -291,7 +291,7 @@
response.capabilities->media_caps =
std::vector<std::string>({"video", "audio", "vp8", "opus"});
session_->OnCapabilitiesResponse(response);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
@@ -305,7 +305,7 @@
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
remoter_->Start();
run_loop.Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
cast_mode_ = "remoting";
Mock::VerifyAndClear(this);
}
@@ -314,7 +314,7 @@
ASSERT_TRUE(cast_mode_ == "remoting");
EXPECT_CALL(remoting_source_, OnStarted()).Times(1);
SendAnswer();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
@@ -326,14 +326,14 @@
EXPECT_CALL(*this, OnOutboundMessage("OFFER")).Times(1);
EXPECT_CALL(remoting_source_, OnStopped(reason)).Times(1);
remoter_->Stop(reason);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
cast_mode_ = "mirroring";
Mock::VerifyAndClear(this);
Mock::VerifyAndClear(&remoting_source_);
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const net::IPEndPoint receiver_endpoint_;
mojo::Binding<mojom::ResourceProvider> resource_provider_binding_;
mojo::Binding<mojom::SessionObserver> session_observer_binding_;
diff --git a/components/mirroring/service/udp_socket_client_unittest.cc b/components/mirroring/service/udp_socket_client_unittest.cc
index b88f2c7a..84a1c6aa 100644
--- a/components/mirroring/service/udp_socket_client_unittest.cc
+++ b/components/mirroring/service/udp_socket_client_unittest.cc
@@ -47,7 +47,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::mojom::NetworkContextPtr network_context_ptr_;
std::unique_ptr<MockNetworkContext> network_context_;
std::unique_ptr<UdpSocketClient> udp_transport_client_;
@@ -70,7 +70,7 @@
&UdpSocketClientTest::OnReceivedPacket, base::Unretained(this)));
run_loop.Run();
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
MockUdpSocket* socket = network_context_->udp_socket();
@@ -117,7 +117,7 @@
EXPECT_CALL(resume_send_cb, Run()).Times(0);
EXPECT_FALSE(udp_transport_client_->SendPacket(
new base::RefCountedData<Packet>(packet), resume_send_cb.Get()));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
{
// Expect the UDPSocket to be created when calling StartReceiving().
diff --git a/components/mirroring/service/video_capture_client_unittest.cc b/components/mirroring/service/video_capture_client_unittest.cc
index 586e7f6..ad4734b 100644
--- a/components/mirroring/service/video_capture_client_unittest.cc
+++ b/components/mirroring/service/video_capture_client_unittest.cc
@@ -59,7 +59,7 @@
client_->Stop();
run_loop.Run();
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
MOCK_METHOD1(OnFrameReceived, void(const gfx::Size&));
@@ -80,7 +80,7 @@
base::Unretained(this)),
error_cb_.Get());
run_loop.Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void OnNewBuffer(int buffer_id, int buffer_size) {
@@ -96,7 +96,7 @@
media::mojom::VideoBufferHandle::NewReadOnlyShmemRegion(
mojo::CreateReadOnlySharedMemoryRegion(buffer_size).region));
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void OnBufferReady(int buffer_id, const gfx::Size& frame_size) {
@@ -109,11 +109,11 @@
.WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
client_->OnBufferReady(buffer_id, GetVideoFrameInfo(frame_size));
run_loop.Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::MockCallback<base::OnceClosure> error_cb_;
std::unique_ptr<FakeVideoCaptureHost> host_impl_;
std::unique_ptr<VideoCaptureClient> client_;
diff --git a/components/mirroring/service/wifi_status_monitor_unittest.cc b/components/mirroring/service/wifi_status_monitor_unittest.cc
index 8fd597a6..d5c7ef6 100644
--- a/components/mirroring/service/wifi_status_monitor_unittest.cc
+++ b/components/mirroring/service/wifi_status_monitor_unittest.cc
@@ -97,7 +97,7 @@
message.message_namespace = mojom::kWebRtcNamespace;
message.json_format_data = response;
inbound_channel_->Send(message.Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Creates a WifiStatusMonitor and start monitoring the status.
@@ -106,7 +106,7 @@
EXPECT_CALL(error_callback_, Run(_)).Times(0);
auto status_monitor =
std::make_unique<WifiStatusMonitor>(&message_dispatcher_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Expect to receive request to send GET_STATUS message when create a
// WifiStatusMonitor.
EXPECT_EQ(mojom::kWebRtcNamespace,
@@ -119,7 +119,7 @@
return status_monitor;
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
private:
mojom::CastMessageChannelPtr CreateInterfacePtrAndBind() {
@@ -128,7 +128,7 @@
return outbound_channel_ptr;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Binding<mojom::CastMessageChannel> binding_;
mojom::CastMessageChannelPtr inbound_channel_;
base::MockCallback<MessageDispatcher::ErrorCallback> error_callback_;
diff --git a/components/nacl/loader/nacl_ipc_adapter_unittest.cc b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
index 9eaa4b01..98c8f962 100644
--- a/components/nacl/loader/nacl_ipc_adapter_unittest.cc
+++ b/components/nacl/loader/nacl_ipc_adapter_unittest.cc
@@ -59,7 +59,7 @@
return adapter_->Send(&msg);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<NaClIPCAdapter> adapter_;
diff --git a/components/net_log/net_export_file_writer_unittest.cc b/components/net_log/net_export_file_writer_unittest.cc
index 2d41be3..c125ba6 100644
--- a/components/net_log/net_export_file_writer_unittest.cc
+++ b/components/net_log/net_export_file_writer_unittest.cc
@@ -254,8 +254,7 @@
class NetExportFileWriterTest : public ::testing::Test {
public:
NetExportFileWriterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
network_service_(network::NetworkService::CreateForTesting()) {}
@@ -440,7 +439,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Use a mock NetworkChangeNotifier so the real one can't add any logging.
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
std::unique_ptr<network::NetworkService> network_service_;
diff --git a/components/network_time/network_time_tracker_unittest.cc b/components/network_time/network_time_tracker_unittest.cc
index 364efa2d..7e77a599 100644
--- a/components/network_time/network_time_tracker_unittest.cc
+++ b/components/network_time/network_time_tracker_unittest.cc
@@ -48,8 +48,7 @@
~NetworkTimeTrackerTest() override {}
NetworkTimeTrackerTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
field_trial_test_(new FieldTrialTest()),
clock_(new base::SimpleTestClock),
tick_clock_(new base::SimpleTestTickClock),
@@ -156,7 +155,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FieldTrialTest> field_trial_test_;
base::TimeDelta resolution_;
base::TimeDelta latency_;
diff --git a/components/ntp_snippets/content_suggestions_service_unittest.cc b/components/ntp_snippets/content_suggestions_service_unittest.cc
index 231c09a..f46a5ed 100644
--- a/components/ntp_snippets/content_suggestions_service_unittest.cc
+++ b/components/ntp_snippets/content_suggestions_service_unittest.cc
@@ -259,7 +259,7 @@
TEST_F(ContentSuggestionsServiceTest,
ShouldCallbackEmptyImageForUnavailableProvider) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
// Assuming there will never be a category with the id below.
diff --git a/components/ntp_snippets/remote/cached_image_fetcher_unittest.cc b/components/ntp_snippets/remote/cached_image_fetcher_unittest.cc
index 96e3b6d..24bddd1 100644
--- a/components/ntp_snippets/remote/cached_image_fetcher_unittest.cc
+++ b/components/ntp_snippets/remote/cached_image_fetcher_unittest.cc
@@ -121,7 +121,7 @@
image_db_->GetCallback(true);
} break;
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
RemoteSuggestionsDatabase* database() { return database_.get(); }
@@ -152,7 +152,7 @@
FakeDB<SnippetImageProto>* image_db_;
TestingPrefServiceSimple pref_service_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(NtpSnippetsCachedImageFetcherTest);
};
diff --git a/components/ntp_snippets/remote/remote_suggestions_fetcher_impl_unittest.cc b/components/ntp_snippets/remote/remote_suggestions_fetcher_impl_unittest.cc
index 42a2904..edc57cf 100644
--- a/components/ntp_snippets/remote/remote_suggestions_fetcher_impl_unittest.cc
+++ b/components/ntp_snippets/remote/remote_suggestions_fetcher_impl_unittest.cc
@@ -201,7 +201,7 @@
base::BindRepeating(&ParseJsonDelayed), GetFetchEndpoint(), api_key,
user_classifier_.get());
- fetcher_->SetClockForTesting(scoped_task_environment_.GetMockClock());
+ fetcher_->SetClockForTesting(task_environment_.GetMockClock());
}
void SignIn() { identity_test_env_.MakePrimaryAccountAvailable(kTestEmail); }
@@ -215,7 +215,7 @@
RemoteSuggestionsFetcherImpl& fetcher() { return *fetcher_; }
MockSnippetsAvailableCallback& mock_callback() { return mock_callback_; }
void FastForwardUntilNoTasksRemain() {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
base::HistogramTester& histogram_tester() { return histogram_tester_; }
@@ -253,8 +253,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
std::map<std::string, std::string> default_variation_params_;
signin::IdentityTestEnvironment identity_test_env_;
network::TestURLLoaderFactory test_url_loader_factory_;
diff --git a/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc b/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
index 6648e669..d0818289 100644
--- a/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
+++ b/components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc
@@ -389,7 +389,7 @@
void RunUntilIdle() {
timer_mock_task_runner_->RunUntilIdle();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void SetCategoryRanker(std::unique_ptr<CategoryRanker> category_ranker) {
@@ -595,7 +595,7 @@
image_fetcher::FakeImageDecoder image_decoder_;
std::unique_ptr<MockScheduler> scheduler_;
RemoteSuggestionsStatusService* remote_suggestions_status_service_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
RemoteSuggestionsStatusService::StatusChangeCallback status_change_callback_;
diff --git a/components/ntp_tiles/custom_links_manager_impl_unittest.cc b/components/ntp_tiles/custom_links_manager_impl_unittest.cc
index 88411c6..4f398bce 100644
--- a/components/ntp_tiles/custom_links_manager_impl_unittest.cc
+++ b/components/ntp_tiles/custom_links_manager_impl_unittest.cc
@@ -103,7 +103,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
base::ScopedTempDir scoped_temp_dir_;
std::unique_ptr<history::HistoryService> history_service_;
@@ -469,7 +469,7 @@
base::UTF8ToUTF16(kTestCase2[0].title), true}}),
custom_links_->GetLinks());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest,
@@ -494,7 +494,7 @@
/*restrict_urls=*/base::nullopt));
EXPECT_TRUE(custom_links_->GetLinks().empty());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, ShouldDeleteOnHistoryDeletionAfterShutdown) {
@@ -523,7 +523,7 @@
/*restrict_urls=*/base::nullopt));
EXPECT_TRUE(custom_links_->GetLinks().empty());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, ShouldNotDeleteCustomLinkOnHistoryDeletion) {
@@ -567,7 +567,7 @@
{Link{GURL(kTestUrl), base::UTF8ToUTF16(kTestTitle), false}}),
custom_links_->GetLinks());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, ShouldIgnoreHistoryExpiredDeletions) {
@@ -601,7 +601,7 @@
EXPECT_EQ(initial_links, custom_links_->GetLinks());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, ShouldIgnoreEmptyHistoryDeletions) {
@@ -622,7 +622,7 @@
EXPECT_EQ(initial_links, custom_links_->GetLinks());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, ShouldNotUndoAfterHistoryDeletion) {
@@ -654,7 +654,7 @@
EXPECT_FALSE(custom_links_->UndoAction());
EXPECT_EQ(links_after_add, custom_links_->GetLinks());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CustomLinksManagerImplTest, UpdateListAfterRemoteChange) {
diff --git a/components/ntp_tiles/icon_cacher_impl_unittest.cc b/components/ntp_tiles/icon_cacher_impl_unittest.cc
index 5b20ce1..4b8a18a 100644
--- a/components/ntp_tiles/icon_cacher_impl_unittest.cc
+++ b/components/ntp_tiles/icon_cacher_impl_unittest.cc
@@ -132,7 +132,7 @@
loop.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir history_dir_;
history::HistoryService history_service_;
favicon::FaviconServiceImpl favicon_service_;
@@ -365,7 +365,7 @@
base::MockCallback<base::Closure> done;
EXPECT_CALL(done, Run()).Times(0);
cacher.StartFetchMostLikely(page_url, done.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(IconIsCachedFor(page_url, favicon_base::IconType::kFavicon));
EXPECT_TRUE(IconIsCachedFor(page_url, favicon_base::IconType::kTouchIcon));
@@ -397,7 +397,7 @@
// Both these task runners need to be flushed in order to get |done| called by
// running the main loop.
WaitForHistoryThreadTasksToFinish();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
loop.Run();
EXPECT_FALSE(IconIsCachedFor(page_url, favicon_base::IconType::kFavicon));
@@ -429,7 +429,7 @@
// Both these task runners need to be flushed before flushing the main thread
// queue in order to finish the work.
WaitForHistoryThreadTasksToFinish();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(IconIsCachedFor(page_url, favicon_base::IconType::kFavicon));
EXPECT_FALSE(IconIsCachedFor(page_url, favicon_base::IconType::kTouchIcon));
@@ -452,14 +452,14 @@
// Finish the posted tasks on the main and the history thread to find out if
// we can write the icon.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
WaitForHistoryThreadTasksToFinish();
// Continue with the work in large icon service - fetch and decode the data.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Do the work on the history thread to write down the icon
WaitForHistoryThreadTasksToFinish();
// Finish the tasks on the main thread.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Even though the callbacks are not called, the icon gets written out.
EXPECT_FALSE(IconIsCachedFor(page_url, favicon_base::IconType::kFavicon));
@@ -493,10 +493,10 @@
// Finish the posted tasks on the main and the history thread to find out if
// we can write the icon.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
WaitForHistoryThreadTasksToFinish();
// Continue with the work in large icon service - fetch and decode the data.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Do the work on the history thread to write down the icon
WaitForHistoryThreadTasksToFinish();
// Finish the tasks on the main thread.
diff --git a/components/ntp_tiles/most_visited_sites_unittest.cc b/components/ntp_tiles/most_visited_sites_unittest.cc
index e099000..548c06d 100644
--- a/components/ntp_tiles/most_visited_sites_unittest.cc
+++ b/components/ntp_tiles/most_visited_sites_unittest.cc
@@ -559,7 +559,7 @@
suggestions_service_callbacks_;
TopSitesCallbackList top_sites_callbacks_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
PopularSitesFactoryForTest popular_sites_factory_;
diff --git a/components/ntp_tiles/popular_sites_impl_unittest.cc b/components/ntp_tiles/popular_sites_impl_unittest.cc
index b965d6b..e61eca2 100644
--- a/components/ntp_tiles/popular_sites_impl_unittest.cc
+++ b/components/ntp_tiles/popular_sites_impl_unittest.cc
@@ -211,8 +211,8 @@
const TestPopularSite kYouTube;
const TestPopularSite kChromium;
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
data_decoder::TestingJsonParser::ScopedFactoryOverride factory_override_;
std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> prefs_;
network::TestURLLoaderFactory test_url_loader_factory_;
diff --git a/components/offline_pages/core/prefetch/prefetch_gcm_app_handler_unittest.cc b/components/offline_pages/core/prefetch/prefetch_gcm_app_handler_unittest.cc
index 69bc7ca3..417a5b8 100644
--- a/components/offline_pages/core/prefetch/prefetch_gcm_app_handler_unittest.cc
+++ b/components/offline_pages/core/prefetch/prefetch_gcm_app_handler_unittest.cc
@@ -54,7 +54,7 @@
~PrefetchGCMAppHandlerTest() override {
// Ensures that the store is properly disposed off.
prefetch_service_taco_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TestPrefetchDispatcher* dispatcher() { return test_dispatcher_; }
@@ -62,7 +62,7 @@
TestTokenFactory* token_factory() { return token_factory_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefetchServiceTestTaco> prefetch_service_taco_;
// Owned by the taco.
diff --git a/components/offline_pages/core/prefetch/suggested_articles_observer_unittest.cc b/components/offline_pages/core/prefetch/suggested_articles_observer_unittest.cc
index 664ae3d..0991d09 100644
--- a/components/offline_pages/core/prefetch/suggested_articles_observer_unittest.cc
+++ b/components/offline_pages/core/prefetch/suggested_articles_observer_unittest.cc
@@ -52,7 +52,7 @@
~OfflinePageSuggestedArticlesObserverTest() override {
// Ensure the store can be properly disposed off.
prefetch_service_test_taco_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
SuggestedArticlesObserver* observer() {
@@ -69,7 +69,7 @@
Category::FromKnownCategory(ntp_snippets::KnownCategories::ARTICLES);
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefetchServiceTestTaco> prefetch_service_test_taco_;
// Owned by the PrefetchServiceTestTaco.
diff --git a/components/omnibox/browser/autocomplete_provider_unittest.cc b/components/omnibox/browser/autocomplete_provider_unittest.cc
index 0897dc3..99e706e 100644
--- a/components/omnibox/browser/autocomplete_provider_unittest.cc
+++ b/components/omnibox/browser/autocomplete_provider_unittest.cc
@@ -312,7 +312,7 @@
// platform, flags, etc.) be instantiated.
void ResetControllerWithType(int type);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AutocompleteController> controller_;
// Owned by |controller_|.
AutocompleteProviderClientWithClosure* client_;
diff --git a/components/omnibox/browser/autocomplete_result_unittest.cc b/components/omnibox/browser/autocomplete_result_unittest.cc
index 801d745b..cbdc123 100644
--- a/components/omnibox/browser/autocomplete_result_unittest.cc
+++ b/components/omnibox/browser/autocomplete_result_unittest.cc
@@ -130,7 +130,7 @@
template_url_service_->Load();
}
- void TearDown() override { scoped_task_environment_.RunUntilIdle(); }
+ void TearDown() override { task_environment_.RunUntilIdle(); }
// Configures |match| from |data|.
void PopulateAutocompleteMatch(const TestData& data,
@@ -162,7 +162,7 @@
std::unique_ptr<TemplateURLService> template_url_service_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::FieldTrialList> field_trial_list_;
// For every provider mentioned in TestData, we need a mock provider.
diff --git a/components/omnibox/browser/base_search_provider_unittest.cc b/components/omnibox/browser/base_search_provider_unittest.cc
index 6f43cb0f..7cb62d2 100644
--- a/components/omnibox/browser/base_search_provider_unittest.cc
+++ b/components/omnibox/browser/base_search_provider_unittest.cc
@@ -85,7 +85,7 @@
AutocompleteProvider::TYPE_SEARCH, client_.get());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<NiceMock<TestBaseSearchProvider>> provider_;
std::unique_ptr<MockAutocompleteProviderClient> client_;
};
diff --git a/components/omnibox/browser/document_suggestions_service_unittest.cc b/components/omnibox/browser/document_suggestions_service_unittest.cc
index e0464f3a..b9ff412 100644
--- a/components/omnibox/browser/document_suggestions_service_unittest.cc
+++ b/components/omnibox/browser/document_suggestions_service_unittest.cc
@@ -37,8 +37,7 @@
class DocumentSuggestionsServiceTest : public testing::Test {
protected:
DocumentSuggestionsServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
shared_url_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)),
@@ -60,7 +59,7 @@
base::FieldTrialList::CreateFieldTrial("trial name", "group name")->group();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
sync_preferences::TestingPrefServiceSyncable prefs_;
diff --git a/components/omnibox/browser/fake_autocomplete_provider_client.cc b/components/omnibox/browser/fake_autocomplete_provider_client.cc
index 1a3b396..e481142 100644
--- a/components/omnibox/browser/fake_autocomplete_provider_client.cc
+++ b/components/omnibox/browser/fake_autocomplete_provider_client.cc
@@ -48,7 +48,7 @@
// it to prevent memory leaks.
GetHistoryService()->Shutdown();
// Note that RunUntilIdle() must still be called after this, from
- // whichever task model is being used, probably ScopedTaskEnvironment,
+ // whichever task model is being used, probably TaskEnvironment,
// or there will be memory leaks.
}
diff --git a/components/omnibox/browser/fake_autocomplete_provider_client.h b/components/omnibox/browser/fake_autocomplete_provider_client.h
index 3aa86d3..424c6a81 100644
--- a/components/omnibox/browser/fake_autocomplete_provider_client.h
+++ b/components/omnibox/browser/fake_autocomplete_provider_client.h
@@ -28,9 +28,9 @@
// Note: The history index rebuild task is created from main thread, usually
// during SetUp(), performed on DB thread and must be deleted on main thread.
// Run main loop to process delete task, to prevent leaks.
-// Note that these tests have switched to using a ScopedTaskEnvironment,
+// Note that these tests have switched to using a TaskEnvironment,
// so clearing that task queue is done through
-// scoped_task_environment_.RunUntilIdle().
+// task_environment_.RunUntilIdle().
class FakeAutocompleteProviderClient : public MockAutocompleteProviderClient {
public:
explicit FakeAutocompleteProviderClient(bool create_history_db = true);
diff --git a/components/omnibox/browser/history_provider_unittest.cc b/components/omnibox/browser/history_provider_unittest.cc
index 16cc78b..a45c8a5 100644
--- a/components/omnibox/browser/history_provider_unittest.cc
+++ b/components/omnibox/browser/history_provider_unittest.cc
@@ -42,7 +42,7 @@
HistoryProvider* provider() { return &(*provider_); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
scoped_refptr<TestHistoryProvider> provider_;
@@ -57,7 +57,7 @@
void HistoryProviderTest::TearDown() {
provider_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Placeholder test. Remove after adding a substantive test.
diff --git a/components/omnibox/browser/history_quick_provider_performance_unittest.cc b/components/omnibox/browser/history_quick_provider_performance_unittest.cc
index 793ec31..cc97840 100644
--- a/components/omnibox/browser/history_quick_provider_performance_unittest.cc
+++ b/components/omnibox/browser/history_quick_provider_performance_unittest.cc
@@ -99,7 +99,7 @@
private:
base::TimeDelta RunTest(const base::string16& text);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
scoped_refptr<HistoryQuickProvider> provider_;
@@ -118,7 +118,7 @@
void HQPPerfTestOnePopularURL::TearDown() {
provider_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void HQPPerfTestOnePopularURL::PrepareData() {
diff --git a/components/omnibox/browser/history_quick_provider_unittest.cc b/components/omnibox/browser/history_quick_provider_unittest.cc
index a7e23ca..090b943 100644
--- a/components/omnibox/browser/history_quick_provider_unittest.cc
+++ b/components/omnibox/browser/history_quick_provider_unittest.cc
@@ -180,7 +180,7 @@
HistoryQuickProvider& provider() { return *provider_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
ACMatches ac_matches_; // The resulting matches after running RunTest.
@@ -213,7 +213,7 @@
void HistoryQuickProviderTest::TearDown() {
provider_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
std::vector<HistoryQuickProviderTest::TestURLInfo>
diff --git a/components/omnibox/browser/history_url_provider_unittest.cc b/components/omnibox/browser/history_url_provider_unittest.cc
index 70a17f0..c650510 100644
--- a/components/omnibox/browser/history_url_provider_unittest.cc
+++ b/components/omnibox/browser/history_url_provider_unittest.cc
@@ -236,7 +236,7 @@
size_t expected_match_location,
size_t expected_match_length);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ACMatches matches_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
scoped_refptr<HistoryURLProvider> autocomplete_;
@@ -282,7 +282,7 @@
void HistoryURLProviderTest::TearDown() {
autocomplete_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void HistoryURLProviderTest::FillData() {
diff --git a/components/omnibox/browser/in_memory_url_index_unittest.cc b/components/omnibox/browser/in_memory_url_index_unittest.cc
index 25315c7..3d53b02 100644
--- a/components/omnibox/browser/in_memory_url_index_unittest.cc
+++ b/components/omnibox/browser/in_memory_url_index_unittest.cc
@@ -169,7 +169,7 @@
void ExpectPrivateDataEqual(const URLIndexPrivateData& expected,
const URLIndexPrivateData& actual);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir history_dir_;
std::unique_ptr<history::HistoryService> history_service_;
history::HistoryDatabase* history_database_ = nullptr;
@@ -292,7 +292,7 @@
// it is destroyed in order to prevent HistoryService calling dead observer.
if (url_index_)
url_index_->Shutdown();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
base::FilePath::StringType InMemoryURLIndexTest::TestDBName() const {
@@ -1433,7 +1433,7 @@
void set_history_dir(const base::FilePath& dir_path);
bool GetCacheFilePath(base::FilePath* file_path) const;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<InMemoryURLIndex> url_index_;
};
diff --git a/components/omnibox/browser/keyword_provider_unittest.cc b/components/omnibox/browser/keyword_provider_unittest.cc
index 943116e..afc4e80 100644
--- a/components/omnibox/browser/keyword_provider_unittest.cc
+++ b/components/omnibox/browser/keyword_provider_unittest.cc
@@ -87,7 +87,7 @@
protected:
static const TemplateURLService::Initializer kTestData[];
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::FieldTrialList> field_trial_list_;
scoped_refptr<KeywordProvider> kw_provider_;
std::unique_ptr<MockAutocompleteProviderClient> client_;
diff --git a/components/omnibox/browser/location_bar_model_impl_unittest.cc b/components/omnibox/browser/location_bar_model_impl_unittest.cc
index 983cf5e..6749d021 100644
--- a/components/omnibox/browser/location_bar_model_impl_unittest.cc
+++ b/components/omnibox/browser/location_bar_model_impl_unittest.cc
@@ -88,7 +88,7 @@
LocationBarModelImpl* model() { return &model_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeLocationBarModelDelegate delegate_;
LocationBarModelImpl model_;
};
diff --git a/components/omnibox/browser/omnibox_controller_unittest.cc b/components/omnibox/browser/omnibox_controller_unittest.cc
index b594984..06480f4 100644
--- a/components/omnibox/browser/omnibox_controller_unittest.cc
+++ b/components/omnibox/browser/omnibox_controller_unittest.cc
@@ -33,7 +33,7 @@
void SetUp() override;
void TearDown() override;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestOmniboxClient> omnibox_client_;
std::unique_ptr<OmniboxController> omnibox_controller_;
diff --git a/components/omnibox/browser/omnibox_edit_model_unittest.cc b/components/omnibox/browser/omnibox_edit_model_unittest.cc
index fc50cafb..350f2ed 100644
--- a/components/omnibox/browser/omnibox_edit_model_unittest.cc
+++ b/components/omnibox/browser/omnibox_edit_model_unittest.cc
@@ -46,7 +46,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestOmniboxEditController> controller_;
std::unique_ptr<TestOmniboxView> view_;
};
diff --git a/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc b/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
index 777c470..ebc2321 100644
--- a/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
+++ b/components/omnibox/browser/omnibox_pedal_implementations_unittest.cc
@@ -19,7 +19,7 @@
: omnibox_client_(new TestOmniboxClient),
omnibox_edit_controller_(new TestOmniboxEditController) {}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestOmniboxClient> omnibox_client_;
std::unique_ptr<TestOmniboxEditController> omnibox_edit_controller_;
};
diff --git a/components/omnibox/browser/omnibox_popup_model_unittest.cc b/components/omnibox/browser/omnibox_popup_model_unittest.cc
index 1273add..4932628c 100644
--- a/components/omnibox/browser/omnibox_popup_model_unittest.cc
+++ b/components/omnibox/browser/omnibox_popup_model_unittest.cc
@@ -59,7 +59,7 @@
OmniboxPopupModel* popup_model() { return &popup_model_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestOmniboxEditController controller_;
TestOmniboxView view_;
TestOmniboxEditModel model_;
diff --git a/components/omnibox/browser/omnibox_view_unittest.cc b/components/omnibox/browser/omnibox_view_unittest.cc
index 1d3c68d..0aee4d12 100644
--- a/components/omnibox/browser/omnibox_view_unittest.cc
+++ b/components/omnibox/browser/omnibox_view_unittest.cc
@@ -58,7 +58,7 @@
bookmarks::BookmarkModel* bookmark_model() { return bookmark_model_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestOmniboxEditController> controller_;
std::unique_ptr<TestOmniboxView> view_;
std::unique_ptr<bookmarks::BookmarkModel> bookmark_model_;
diff --git a/components/omnibox/browser/on_device_head_provider_unittest.cc b/components/omnibox/browser/on_device_head_provider_unittest.cc
index f58d319f3..8309a53 100644
--- a/components/omnibox/browser/on_device_head_provider_unittest.cc
+++ b/components/omnibox/browser/on_device_head_provider_unittest.cc
@@ -29,13 +29,13 @@
client_.reset(new FakeAutocompleteProviderClient());
SetTestOnDeviceHeadModel();
provider_ = OnDeviceHeadProvider::Create(client_.get(), this);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void TearDown() override {
provider_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// AutocompleteProviderListener:
@@ -52,7 +52,7 @@
auto* update_listener = OnDeviceModelUpdateListener::GetInstance();
if (update_listener)
update_listener->OnModelUpdate(file_path);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void ResetServingInstance() {
@@ -63,7 +63,7 @@
}
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
scoped_refptr<OnDeviceHeadProvider> provider_;
};
@@ -80,7 +80,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->matches().empty());
EXPECT_TRUE(provider_->done());
@@ -94,7 +94,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->matches().empty());
EXPECT_TRUE(provider_->done());
@@ -110,7 +110,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->matches().empty());
EXPECT_TRUE(provider_->done());
@@ -128,7 +128,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->matches().empty());
EXPECT_TRUE(provider_->done());
@@ -145,7 +145,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->matches().empty());
EXPECT_TRUE(provider_->done());
@@ -162,7 +162,7 @@
provider_->Start(input, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->done());
ASSERT_EQ(3U, provider_->matches().size());
@@ -190,7 +190,7 @@
provider_->Start(input2, false);
if (!provider_->done())
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(provider_->done());
ASSERT_EQ(3U, provider_->matches().size());
diff --git a/components/omnibox/browser/shortcuts_backend_unittest.cc b/components/omnibox/browser/shortcuts_backend_unittest.cc
index b64f98f..c9552a8 100644
--- a/components/omnibox/browser/shortcuts_backend_unittest.cc
+++ b/components/omnibox/browser/shortcuts_backend_unittest.cc
@@ -60,7 +60,7 @@
TemplateURLService* GetTemplateURLService();
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir profile_dir_;
std::unique_ptr<TemplateURLService> template_url_service_;
std::unique_ptr<history::HistoryService> history_service_;
@@ -124,7 +124,7 @@
void ShortcutsBackendTest::TearDown() {
backend_->RemoveObserver(this);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void ShortcutsBackendTest::OnShortcutsLoaded() {
@@ -140,7 +140,7 @@
ASSERT_FALSE(load_notified_);
ASSERT_FALSE(backend_->initialized());
backend_->Init();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(load_notified_);
EXPECT_TRUE(backend_->initialized());
}
diff --git a/components/omnibox/browser/shortcuts_provider_unittest.cc b/components/omnibox/browser/shortcuts_provider_unittest.cc
index 845e512..6147995 100644
--- a/components/omnibox/browser/shortcuts_provider_unittest.cc
+++ b/components/omnibox/browser/shortcuts_provider_unittest.cc
@@ -200,7 +200,7 @@
const ShortcutsDatabase::Shortcut& shortcut,
int max_relevance);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
scoped_refptr<ShortcutsProvider> provider_;
};
@@ -220,7 +220,7 @@
void ShortcutsProviderTest::TearDown() {
provider_ = nullptr;
client_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
int ShortcutsProviderTest::CalculateScore(
diff --git a/components/omnibox/browser/zero_suggest_provider_unittest.cc b/components/omnibox/browser/zero_suggest_provider_unittest.cc
index b33210d..ffb6ec3 100644
--- a/components/omnibox/browser/zero_suggest_provider_unittest.cc
+++ b/components/omnibox/browser/zero_suggest_provider_unittest.cc
@@ -155,7 +155,7 @@
void CreateMostVisitedFieldTrial();
void SetZeroSuggestVariantForAllContexts(const std::string& variant);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::test::ScopedFeatureList> scoped_feature_list_;
std::unique_ptr<FakeAutocompleteProviderClient> client_;
diff --git a/components/optimization_guide/hint_cache_unittest.cc b/components/optimization_guide/hint_cache_unittest.cc
index 6d6ebf7..c317930 100644
--- a/components/optimization_guide/hint_cache_unittest.cc
+++ b/components/optimization_guide/hint_cache_unittest.cc
@@ -46,8 +46,7 @@
void CreateAndInitializeHintCache(int memory_cache_size,
bool purge_existing_data = false) {
auto database_path = temp_dir_.GetPath();
- auto database_task_runner =
- scoped_task_environment_.GetMainThreadTaskRunner();
+ auto database_task_runner = task_environment_.GetMainThreadTaskRunner();
hint_cache_ = std::make_unique<HintCache>(
std::make_unique<HintCacheStore>(db_provider_.get(), database_path,
nullptr /* pref_service */,
@@ -120,7 +119,7 @@
private:
void RunUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
@@ -131,7 +130,7 @@
loaded_hint_ = hint;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<HintCache> hint_cache_;
const proto::Hint* loaded_hint_;
diff --git a/components/optimization_guide/hints_fetcher_unittest.cc b/components/optimization_guide/hints_fetcher_unittest.cc
index 429e563..5210f2c 100644
--- a/components/optimization_guide/hints_fetcher_unittest.cc
+++ b/components/optimization_guide/hints_fetcher_unittest.cc
@@ -92,12 +92,12 @@
private:
void RunUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
bool hints_fetched_ = false;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<HintsFetcher> hints_fetcher_;
diff --git a/components/optimization_guide/optimization_guide_service_unittest.cc b/components/optimization_guide/optimization_guide_service_unittest.cc
index 5a76835..58752e8 100644
--- a/components/optimization_guide/optimization_guide_service_unittest.cc
+++ b/components/optimization_guide/optimization_guide_service_unittest.cc
@@ -63,7 +63,7 @@
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
optimization_guide_service_ = std::make_unique<OptimizationGuideService>(
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
observer_ = std::make_unique<TestObserver>();
}
@@ -82,14 +82,14 @@
void MaybeUpdateHintsComponent(const HintsComponentInfo& info) {
optimization_guide_service_->MaybeUpdateHintsComponent(info);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
base::FilePath temp_dir() const { return temp_dir_.GetPath(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<OptimizationGuideService> optimization_guide_service_;
diff --git a/components/os_crypt/keychain_password_mac_unittest.mm b/components/os_crypt/keychain_password_mac_unittest.mm
index 1502ce10..b208d7c 100644
--- a/components/os_crypt/keychain_password_mac_unittest.mm
+++ b/components/os_crypt/keychain_password_mac_unittest.mm
@@ -94,7 +94,7 @@
#if !defined(OS_IOS)
// Waits until all tasks in the task runner's queue are finished.
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
base::HistogramTester& histogram_tester() { return histogram_tester_; }
@@ -107,7 +107,7 @@
private:
#if !defined(OS_IOS)
base::HistogramTester histogram_tester_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
#endif
DISALLOW_COPY_AND_ASSIGN(KeychainPasswordTest);
diff --git a/components/page_image_annotation/core/page_annotator_unittest.cc b/components/page_image_annotation/core/page_annotator_unittest.cc
index 2630345..3adad59e 100644
--- a/components/page_image_annotation/core/page_annotator_unittest.cc
+++ b/components/page_image_annotation/core/page_annotator_unittest.cc
@@ -89,7 +89,7 @@
TEST(PageAnnotatorTest, ImageTracking) {
const auto get_pixels = base::BindRepeating([]() { return SkBitmap(); });
- base::test::ScopedTaskEnvironment test_task_env;
+ base::test::TaskEnvironment test_task_env;
PageAnnotator page_annotator((mojo::NullRemote()));
@@ -119,7 +119,7 @@
// the local ImageProcessor.
const auto get_pixels = base::BindRepeating([]() { return SkBitmap(); });
- base::test::ScopedTaskEnvironment test_task_env;
+ base::test::TaskEnvironment test_task_env;
TestAnnotator test_annotator;
PageAnnotator page_annotator(test_annotator.GetRemote());
diff --git a/components/password_manager/core/browser/android_affiliation/affiliated_match_helper_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliated_match_helper_unittest.cc
index e1ad3d4..f0d416a 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliated_match_helper_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliated_match_helper_unittest.cc
@@ -348,7 +348,7 @@
RunUntilIdle();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedMockTimeMessageLoopTaskRunner mock_time_task_runner_;
std::vector<std::string> last_result_realms_;
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_backend_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_backend_unittest.cc
index 44f78d3f..e5cce3f 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_backend_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_backend_unittest.cc
@@ -363,7 +363,7 @@
GetTestEquivalenceClassGamma());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::TestMockTimeTaskRunner> backend_task_runner_;
scoped_refptr<base::TestSimpleTaskRunner> consumer_task_runner_;
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_unittest.cc
index e430ff3f2..6485e3f 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_fetch_throttler_unittest.cc
@@ -82,7 +82,7 @@
network::TestNetworkConnectionTracker::GetInstance()->SetConnectionType(
has_connectivity ? network::mojom::ConnectionType::CONNECTION_ETHERNET
: network::mojom::ConnectionType::CONNECTION_NONE);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Runs the task runner until no tasks remain, and asserts that by this time,
@@ -127,7 +127,7 @@
private:
// Needed because NetworkConnectionTracker uses base::ObserverList, which
// notifies observers on the sequence from which they have registered.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::TestMockTimeTaskRunner> task_runner_;
MockAffiliationFetchThrottlerDelegate mock_delegate_;
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
index 1caccd2..4096334cd 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_fetcher_unittest.cc
@@ -112,14 +112,14 @@
test_url_loader_factory_.AddResponse(interception_url(), head, "", status);
}
- void WaitForResponse() { scoped_task_environment_.RunUntilIdle(); }
+ void WaitForResponse() { task_environment_.RunUntilIdle(); }
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory() {
return test_shared_loader_factory_;
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
std::string intercepted_body_;
diff --git a/components/password_manager/core/browser/android_affiliation/affiliation_service_unittest.cc b/components/password_manager/core/browser/android_affiliation/affiliation_service_unittest.cc
index 20f73f2..7877dd89 100644
--- a/components/password_manager/core/browser/android_affiliation/affiliation_service_unittest.cc
+++ b/components/password_manager/core/browser/android_affiliation/affiliation_service_unittest.cc
@@ -70,7 +70,7 @@
return &fake_affiliation_api_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
// testing::Test:
@@ -129,7 +129,7 @@
testing::Contains(testing::Field(
&Facet::uri, FacetURI::FromCanonicalSpec(kTestFacetURIAlpha1))));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(mock_consumer());
// The second request should be (and can be) served from cache.
@@ -141,7 +141,7 @@
ASSERT_FALSE(fake_affiliation_api()->HasPendingRequest());
mock_consumer()->ExpectSuccessWithResult(equivalence_class_alpha);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(mock_consumer());
// The third request is also restricted to the cache, but cannot be served
@@ -154,7 +154,7 @@
ASSERT_FALSE(fake_affiliation_api()->HasPendingRequest());
mock_consumer()->ExpectFailure();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(mock_consumer());
}
@@ -169,7 +169,7 @@
background_task_runner()->RunUntilIdle();
mock_consumer()->ExpectFailure();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(mock_consumer());
}
diff --git a/components/password_manager/core/browser/blacklisted_credentials_cleaner_unittest.cc b/components/password_manager/core/browser/blacklisted_credentials_cleaner_unittest.cc
index 2f4a072..32c13517 100644
--- a/components/password_manager/core/browser/blacklisted_credentials_cleaner_unittest.cc
+++ b/components/password_manager/core/browser/blacklisted_credentials_cleaner_unittest.cc
@@ -71,11 +71,11 @@
~BlacklistedCredentialsCleanerTest() override {
store_->ShutdownOnUIThread();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
const scoped_refptr<TestPasswordStore> store_ =
base::MakeRefCounted<TestPasswordStore>();
@@ -98,7 +98,7 @@
MockCredentialsCleanerObserver observer;
cleaner_.StartCleaning(&observer);
EXPECT_CALL(observer, CleaningCompleted);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(prefs_.GetBoolean(prefs::kBlacklistedCredentialsNormalized));
}
@@ -111,7 +111,7 @@
MockCredentialsCleanerObserver observer;
cleaner_.StartCleaning(&observer);
EXPECT_CALL(observer, CleaningCompleted);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
TestPasswordStore::PasswordMap stored_passwords = store_->stored_passwords();
ASSERT_EQ(1u, stored_passwords.size());
@@ -133,7 +133,7 @@
MockCredentialsCleanerObserver observer;
cleaner_.StartCleaning(&observer);
EXPECT_CALL(observer, CleaningCompleted);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
TestPasswordStore::PasswordMap stored_passwords = store_->stored_passwords();
ASSERT_EQ(1u, stored_passwords.size());
@@ -148,7 +148,7 @@
// Create a duplicated entry for the same signon realm.
test_credential.username_value = base::ASCIIToUTF16(kTestUsername2);
store_->AddLogin(test_credential);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const TestPasswordStore::PasswordMap& stored_passwords =
store_->stored_passwords();
@@ -158,7 +158,7 @@
MockCredentialsCleanerObserver observer;
cleaner_.StartCleaning(&observer);
EXPECT_CALL(observer, CleaningCompleted);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(1u, stored_passwords.size());
// Only one credential for the signon realm is left.
diff --git a/components/password_manager/core/browser/credential_manager_impl_unittest.cc b/components/password_manager/core/browser/credential_manager_impl_unittest.cc
index bae6bd4..788bf3b 100644
--- a/components/password_manager/core/browser/credential_manager_impl_unittest.cc
+++ b/components/password_manager/core/browser/credential_manager_impl_unittest.cc
@@ -333,10 +333,10 @@
std::move(callback));
}
- void RunAllPendingTasks() { scoped_task_environment_.RunUntilIdle(); }
+ void RunAllPendingTasks() { task_environment_.RunUntilIdle(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
autofill::PasswordForm form_;
autofill::PasswordForm affiliated_form1_;
autofill::PasswordForm affiliated_form2_;
diff --git a/components/password_manager/core/browser/credential_manager_password_form_manager_unittest.cc b/components/password_manager/core/browser/credential_manager_password_form_manager_unittest.cc
index 25bd809..ad1e5c7 100644
--- a/components/password_manager/core/browser/credential_manager_password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/credential_manager_password_form_manager_unittest.cc
@@ -97,7 +97,7 @@
}
// Necessary for callbacks, and for TestAutofillDriver.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
StubPasswordManagerClient client_;
MockDelegate delegate_;
diff --git a/components/password_manager/core/browser/export/password_manager_exporter_unittest.cc b/components/password_manager/core/browser/export/password_manager_exporter_unittest.cc
index 3595289..6593091 100644
--- a/components/password_manager/core/browser/export/password_manager_exporter_unittest.cc
+++ b/components/password_manager/core/browser/export/password_manager_exporter_unittest.cc
@@ -95,8 +95,7 @@
class PasswordManagerExporterTest : public testing::Test {
public:
PasswordManagerExporterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
exporter_(&fake_credential_provider_, mock_on_progress_.Get()),
destination_path_(kNullFileName) {
exporter_.SetWriteForTesting(mock_write_file_.Get());
@@ -110,7 +109,7 @@
~PasswordManagerExporterTest() override = default;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::vector<std::unique_ptr<autofill::PasswordForm>> password_list_;
FakeCredentialProvider fake_credential_provider_;
base::MockCallback<base::RepeatingCallback<
@@ -145,7 +144,7 @@
exporter_.PreparePasswordsForExport();
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// When writing fails, we should notify the UI of the failure and try to cleanup
@@ -166,7 +165,7 @@
exporter_.PreparePasswordsForExport();
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// A partial write should be considered a failure and be cleaned up.
@@ -189,7 +188,7 @@
exporter_.PreparePasswordsForExport();
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Test that GetProgressStatus() returns the last ExportProgressStatus sent
@@ -212,7 +211,7 @@
exporter_.SetDestination(destination_path_);
ASSERT_EQ(exporter_.GetProgressStatus(), status);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(exporter_.GetProgressStatus(), status);
}
@@ -224,7 +223,7 @@
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(PasswordManagerExporterTest, CancelAfterPasswords) {
@@ -236,7 +235,7 @@
exporter_.PreparePasswordsForExport();
exporter_.Cancel();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(PasswordManagerExporterTest, CancelWhileExporting) {
@@ -253,7 +252,7 @@
exporter_.SetDestination(destination_path_);
exporter_.Cancel();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// The "Cancel" button may still be visible on the UI after we've completed
@@ -274,10 +273,10 @@
exporter_.PreparePasswordsForExport();
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
exporter_.Cancel();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
#if defined(OS_POSIX)
@@ -292,7 +291,7 @@
exporter_.PreparePasswordsForExport();
exporter_.SetDestination(destination_path_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
#endif
diff --git a/components/password_manager/core/browser/form_fetcher_impl_unittest.cc b/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
index 3f2137f..feb0143 100644
--- a/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
+++ b/components/password_manager/core/browser/form_fetcher_impl_unittest.cc
@@ -200,11 +200,11 @@
#endif
EXPECT_CALL(*mock_store_, GetLogins(form_digest_, form_fetcher_.get()));
form_fetcher_->Fetch();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(mock_store_.get());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
PasswordStore::FormDigest form_digest_;
std::unique_ptr<FormFetcherImpl> form_fetcher_;
MockConsumer consumer_;
@@ -422,7 +422,7 @@
EXPECT_CALL(*mock_store_, GetSiteStatsImpl(stats.origin_domain))
.WillOnce(Return(db_stats));
form_fetcher_->Fetch();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(form_fetcher_->GetInteractionsStats(),
UnorderedElementsAre(stats));
@@ -432,7 +432,7 @@
EXPECT_CALL(*mock_store_, GetLogins(form_digest_, form_fetcher_.get()));
EXPECT_CALL(*mock_store_, GetSiteStatsImpl(_)).Times(0);
form_fetcher_->Fetch();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
#endif
diff --git a/components/password_manager/core/browser/form_saver_impl_unittest.cc b/components/password_manager/core/browser/form_saver_impl_unittest.cc
index d117476..58687c7f 100644
--- a/components/password_manager/core/browser/form_saver_impl_unittest.cc
+++ b/components/password_manager/core/browser/form_saver_impl_unittest.cc
@@ -77,7 +77,7 @@
protected:
// For the MockPasswordStore.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<StrictMock<MockPasswordStore>> mock_store_;
FormSaverImpl form_saver_;
diff --git a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
index 9ec93ad..5b6a270 100644
--- a/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
+++ b/components/password_manager/core/browser/generation/password_requirements_spec_fetcher_unittest.cc
@@ -207,8 +207,8 @@
SCOPED_TRACE(test.test_name);
base::HistogramTester histogram_tester;
- base::test::ScopedTaskEnvironment environment(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment environment(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
network::TestURLLoaderFactory loader_factory;
loader_factory.AddResponse(test.requested_url, test.response_content,
test.response_status);
@@ -262,8 +262,8 @@
(*shard.mutable_specs())["b.com"].set_min_length(18);
shard.SerializeToString(&serialized_shard);
- base::test::ScopedTaskEnvironment environment(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment environment(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
network::TestURLLoaderFactory loader_factory;
// Target into which data will be written by the callback.
@@ -315,7 +315,7 @@
// In case of incognito mode, we won't have a URL loader factory.
// Test that an empty spec is returned by the spec fetcher in this case.
TEST(PasswordRequirementsSpecFetcherTest, FetchDataWithoutURLLoaderFactory) {
- base::test::ScopedTaskEnvironment environment;
+ base::test::TaskEnvironment environment;
// Target into which data will be written by the callback.
PasswordRequirementsSpec received_spec;
diff --git a/components/password_manager/core/browser/hsts_query_unittest.cc b/components/password_manager/core/browser/hsts_query_unittest.cc
index ebd21cb..5b4012e 100644
--- a/components/password_manager/core/browser/hsts_query_unittest.cc
+++ b/components/password_manager/core/browser/hsts_query_unittest.cc
@@ -71,7 +71,7 @@
private:
// Used by request_context_.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<net::TestURLRequestContextGetter> request_context_;
network::mojom::NetworkContextPtr network_context_pipe_;
std::unique_ptr<network::NetworkContext> network_context_;
diff --git a/components/password_manager/core/browser/http_auth_manager_unittest.cc b/components/password_manager/core/browser/http_auth_manager_unittest.cc
index 3da807da..234cfbc 100644
--- a/components/password_manager/core/browser/http_auth_manager_unittest.cc
+++ b/components/password_manager/core/browser/http_auth_manager_unittest.cc
@@ -122,7 +122,7 @@
HttpAuthManagerImpl* httpauth_manager() { return httpauth_manager_.get(); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockPasswordStore> store_;
testing::NiceMock<MockPasswordManagerClient> client_;
std::unique_ptr<HttpAuthManagerImpl> httpauth_manager_;
diff --git a/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc b/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc
index 1e8e20ed..379f9c2 100644
--- a/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc
+++ b/components/password_manager/core/browser/http_credentials_cleaner_unittest.cc
@@ -138,7 +138,7 @@
static const base::string16 password[2] = {base::ASCIIToUTF16("pass0"),
base::ASCIIToUTF16("pass1")};
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
ASSERT_TRUE(store_->Init(syncer::SyncableService::StartSyncFlare(), nullptr));
TestCase test = GetParam();
SCOPED_TRACE(testing::Message()
@@ -187,7 +187,7 @@
run_loop.QuitClosure());
run_loop.Run();
}
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
base::HistogramTester histogram_tester;
const TestPasswordStore::PasswordMap passwords_before_cleaning =
@@ -212,7 +212,7 @@
&prefs);
EXPECT_CALL(observer, CleaningCompleted);
cleaner.StartCleaning(&observer);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
histogram_tester.ExpectUniqueSample(
"PasswordManager.HttpCredentials",
@@ -237,7 +237,7 @@
}
store_->ShutdownOnUIThread();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
INSTANTIATE_TEST_SUITE_P(,
@@ -249,7 +249,7 @@
SCOPED_TRACE(testing::Message()
<< "should_start_clean_up=" << should_start_clean_up);
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
auto password_store = base::MakeRefCounted<TestPasswordStore>();
ASSERT_TRUE(password_store->Init(syncer::SyncableService::StartSyncFlare(),
nullptr));
@@ -275,7 +275,7 @@
if (!should_start_clean_up) {
password_store->ShutdownOnUIThread();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
continue;
}
@@ -304,13 +304,13 @@
EXPECT_TRUE(cleaner.NeedsCleaning());
EXPECT_CALL(observer, CleaningCompleted);
cleaner.StartCleaning(&observer);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_NE(prefs.GetDouble(prefs::kLastTimeObsoleteHttpCredentialsRemoved),
last_time);
password_store->ShutdownOnUIThread();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
}
diff --git a/components/password_manager/core/browser/http_password_store_migrator_unittest.cc b/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
index 4597043..ccfab58 100644
--- a/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
+++ b/components/password_manager/core/browser/http_password_store_migrator_unittest.cc
@@ -130,7 +130,7 @@
MockPasswordStore& store() { return *mock_store_; }
MockPasswordManagerClient& client() { return client_; }
- void WaitForPasswordStore() { scoped_task_environment_.RunUntilIdle(); }
+ void WaitForPasswordStore() { task_environment_.RunUntilIdle(); }
protected:
void TestEmptyStore(bool is_hsts);
@@ -138,7 +138,7 @@
void TestMigratorDeletionByConsumer(bool is_hsts);
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockConsumer consumer_;
scoped_refptr<MockPasswordStore> mock_store_;
MockPasswordManagerClient client_;
diff --git a/components/password_manager/core/browser/import/password_importer_unittest.cc b/components/password_manager/core/browser/import/password_importer_unittest.cc
index 48a632b..59c69b9 100644
--- a/components/password_manager/core/browser/import/password_importer_unittest.cc
+++ b/components/password_manager/core/browser/import/password_importer_unittest.cc
@@ -36,7 +36,7 @@
base::Bind(&PasswordImporterTest::OnImportFinished,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(callback_called_);
}
@@ -57,7 +57,7 @@
base::ScopedTempDir temp_directory_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool callback_called_;
PasswordImporter::Result result_;
diff --git a/components/password_manager/core/browser/leak_detection/authenticated_leak_check_unittest.cc b/components/password_manager/core/browser/leak_detection/authenticated_leak_check_unittest.cc
index 448d561d..8212bda 100644
--- a/components/password_manager/core/browser/leak_detection/authenticated_leak_check_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection/authenticated_leak_check_unittest.cc
@@ -86,7 +86,7 @@
}
~AuthenticatedLeakCheckTest() override = default;
- base::test::ScopedTaskEnvironment& task_env() { return task_env_; }
+ base::test::TaskEnvironment& task_env() { return task_env_; }
signin::IdentityTestEnvironment& identity_env() { return identity_test_env_; }
MockLeakDetectionDelegateInterface& delegate() { return delegate_; }
MockLeakDetectionRequestFactory* request_factory() {
@@ -100,7 +100,7 @@
PayloadAndCallback ImitateNetworkRequest();
private:
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
signin::IdentityTestEnvironment identity_test_env_;
StrictMock<MockLeakDetectionDelegateInterface> delegate_;
MockLeakDetectionRequestFactory* request_factory_;
diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl_unittest.cc b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl_unittest.cc
index 5a38d80..32bd691 100644
--- a/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection/leak_detection_check_factory_impl_unittest.cc
@@ -35,7 +35,7 @@
LeakDetectionCheckFactoryImpl& request_factory() { return request_factory_; }
private:
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
signin::IdentityTestEnvironment identity_test_env_;
StrictMock<MockLeakDetectionDelegateInterface> delegate_;
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_ =
diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_unittest.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_unittest.cc
index 36c2303..56f58e4 100644
--- a/components/password_manager/core/browser/leak_detection/leak_detection_request_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_unittest.cc
@@ -24,14 +24,14 @@
~LeakDetectionRequestTest() override = default;
- base::test::ScopedTaskEnvironment& task_env() { return task_env_; }
+ base::test::TaskEnvironment& task_env() { return task_env_; }
network::TestURLLoaderFactory* test_url_loader_factory() {
return &test_url_loader_factory_;
}
LeakDetectionRequest& request() { return request_; }
private:
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
network::TestURLLoaderFactory test_url_loader_factory_;
LeakDetectionRequest request_;
};
diff --git a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils_unittest.cc b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils_unittest.cc
index ae7ca5b..2db6b25 100644
--- a/components/password_manager/core/browser/leak_detection/leak_detection_request_utils_unittest.cc
+++ b/components/password_manager/core/browser/leak_detection/leak_detection_request_utils_unittest.cc
@@ -26,7 +26,7 @@
} // namespace
TEST(LeakDetectionRequestUtils, PrepareSingleLeakRequestData) {
- base::test::ScopedTaskEnvironment task_env;
+ base::test::TaskEnvironment task_env;
base::MockCallback<SingleLeakRequestDataCallback> callback;
PrepareSingleLeakRequestData("jonsnow", "1234", callback.Get());
@@ -41,7 +41,7 @@
}
TEST(LeakDetectionRequestUtils, AnalyzeResponseResult_NoLeak) {
- base::test::ScopedTaskEnvironment task_env;
+ base::test::TaskEnvironment task_env;
constexpr char kUsernamePasswordHash[] = "abcdefg";
auto response = std::make_unique<SingleLookupResponse>();
@@ -68,7 +68,7 @@
}
TEST(LeakDetectionRequestUtils, AnalyzeResponseResult_Leak) {
- base::test::ScopedTaskEnvironment task_env;
+ base::test::TaskEnvironment task_env;
constexpr char kUsernamePasswordHash[] = "abcdefg";
auto response = std::make_unique<SingleLookupResponse>();
diff --git a/components/password_manager/core/browser/login_database_ios_unittest.cc b/components/password_manager/core/browser/login_database_ios_unittest.cc
index c9cf4b51..16896d2 100644
--- a/components/password_manager/core/browser/login_database_ios_unittest.cc
+++ b/components/password_manager/core/browser/login_database_ios_unittest.cc
@@ -46,7 +46,7 @@
protected:
base::ScopedTempDir temp_dir_;
std::unique_ptr<LoginDatabase> login_db_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
void LoginDatabaseIOSTest::ClearKeychain() {
diff --git a/components/password_manager/core/browser/login_database_unittest.cc b/components/password_manager/core/browser/login_database_unittest.cc
index 58721ec..a986c89 100644
--- a/components/password_manager/core/browser/login_database_unittest.cc
+++ b/components/password_manager/core/browser/login_database_unittest.cc
@@ -273,7 +273,7 @@
base::ScopedTempDir temp_dir_;
base::FilePath file_;
std::unique_ptr<LoginDatabase> db_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(LoginDatabaseTest, Logins) {
@@ -1934,7 +1934,7 @@
private:
base::FilePath database_dump_location_;
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
void LoginDatabaseMigrationTest::MigrationToVCurrent(
@@ -2088,12 +2088,12 @@
return testing_local_state_;
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
private:
base::FilePath database_path_;
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple testing_local_state_;
DISALLOW_COPY_AND_ASSIGN(LoginDatabaseUndecryptableLoginsTest);
diff --git a/components/password_manager/core/browser/password_autofill_manager_unittest.cc b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
index 67362c00..ba4a1af 100644
--- a/components/password_manager/core/browser/password_autofill_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_autofill_manager_unittest.cc
@@ -194,7 +194,7 @@
// The TestAutofillDriver uses a SequencedWorkerPool which expects the
// existence of a MessageLoop.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PasswordAutofillManagerTest, FillSuggestion) {
diff --git a/components/password_manager/core/browser/password_form_manager_unittest.cc b/components/password_manager/core/browser/password_form_manager_unittest.cc
index 8b2ff26..40cfaae 100644
--- a/components/password_manager/core/browser/password_form_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_form_manager_unittest.cc
@@ -1017,7 +1017,7 @@
private:
// Necessary for callbacks, and for TestAutofillDriver.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
PasswordForm observed_form_;
PasswordForm saved_match_;
diff --git a/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc b/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
index ce979a3..8858878 100644
--- a/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
+++ b/components/password_manager/core/browser/password_form_metrics_recorder_unittest.cc
@@ -69,7 +69,7 @@
// Test the metrics recorded around password generation and the user's
// interaction with the offer to generate passwords.
TEST(PasswordFormMetricsRecorder, Generation) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
static constexpr struct {
bool generation_available;
bool has_generated_password;
@@ -200,7 +200,7 @@
// Test the recording of metrics around manager_action, user_action, and
// submit_result.
TEST(PasswordFormMetricsRecorder, Actions) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
static constexpr struct {
// Stimuli:
bool is_main_frame_secure;
@@ -297,7 +297,7 @@
}
TEST(PasswordFormMetricsRecorder, SubmittedFormType) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
static constexpr struct {
// Stimuli:
bool is_main_frame_secure;
@@ -356,7 +356,7 @@
}
TEST(PasswordFormMetricsRecorder, RecordPasswordBubbleShown) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using Trigger = PasswordFormMetricsRecorder::BubbleTrigger;
static constexpr struct {
// Stimuli:
@@ -451,7 +451,7 @@
}
TEST(PasswordFormMetricsRecorder, RecordUIDismissalReason) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
static constexpr struct {
// Stimuli:
metrics_util::UIDisplayDisposition display_disposition;
@@ -503,7 +503,7 @@
// Verify that it is ok to open and close the password bubble more than once
// and still get accurate metrics.
TEST(PasswordFormMetricsRecorder, SequencesOfBubbles) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using BubbleDismissalReason =
PasswordFormMetricsRecorder::BubbleDismissalReason;
using BubbleTrigger = PasswordFormMetricsRecorder::BubbleTrigger;
@@ -550,7 +550,7 @@
// Verify that one-time actions are only recorded once per life-cycle of a
// PasswordFormMetricsRecorder.
TEST(PasswordFormMetricsRecorder, RecordDetailedUserAction) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using Action = PasswordFormMetricsRecorder::DetailedUserAction;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{
@@ -576,7 +576,7 @@
// Verify that the the mapping is correct and that metrics are actually
// recorded.
TEST(PasswordFormMetricsRecorder, RecordShowManualFallbackForSaving) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
struct {
bool has_generated_password;
bool is_update;
@@ -606,7 +606,7 @@
// Verify that no 0 is recorded if now fallback icon is shown.
TEST(PasswordFormMetricsRecorder, NoRecordShowManualFallbackForSaving) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{
auto recorder = CreatePasswordFormMetricsRecorder(
@@ -621,7 +621,7 @@
// Verify that only the latest value is recorded
TEST(PasswordFormMetricsRecorder, RecordShowManualFallbackForSavingLatestOnly) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{
auto recorder = CreatePasswordFormMetricsRecorder(
@@ -736,7 +736,7 @@
<< ", is_main_frame_secure: " << std::boolalpha
<< is_main_frame_secure);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester;
FormData form_data = ConvertToFormData(test_case.fields);
diff --git a/components/password_manager/core/browser/password_generation_frame_helper_unittest.cc b/components/password_manager/core/browser/password_generation_frame_helper_unittest.cc
index f2bf07a..57d5e3a 100644
--- a/components/password_manager/core/browser/password_generation_frame_helper_unittest.cc
+++ b/components/password_manager/core/browser/password_generation_frame_helper_unittest.cc
@@ -182,7 +182,7 @@
return GetGenerationHelper()->IsGenerationEnabled(true);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockPasswordManagerClient> client_;
};
diff --git a/components/password_manager/core/browser/password_generation_state_unittest.cc b/components/password_manager/core/browser/password_generation_state_unittest.cc
index dd47e53..101cc0c 100644
--- a/components/password_manager/core/browser/password_generation_state_unittest.cc
+++ b/components/password_manager/core/browser/password_generation_state_unittest.cc
@@ -133,7 +133,7 @@
private:
// For the MockPasswordStore.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockPasswordStore> mock_store_;
// Test with the real form saver for better robustness.
FormSaverImpl form_saver_;
diff --git a/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc b/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
index b48005f..ee412ebf 100644
--- a/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_metrics_recorder_unittest.cc
@@ -34,7 +34,7 @@
} // namespace
TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordField) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{
PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder());
@@ -52,7 +52,7 @@
}
TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordFieldMultipleTimes) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{
PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder());
@@ -71,7 +71,7 @@
}
TEST(PasswordManagerMetricsRecorder, UserModifiedPasswordFieldNotCalled) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder;
{ PasswordManagerMetricsRecorder recorder(CreateMetricsRecorder()); }
const auto& entries =
diff --git a/components/password_manager/core/browser/password_manager_onboarding_unittest.cc b/components/password_manager/core/browser/password_manager_onboarding_unittest.cc
index 7044b20..bdab255 100644
--- a/components/password_manager/core/browser/password_manager_onboarding_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_onboarding_unittest.cc
@@ -55,7 +55,7 @@
PrefService* GetPrefs() { return prefs_.get(); }
- void RunAllPendingTasks() { scoped_task_environment_.RunUntilIdle(); }
+ void RunAllPendingTasks() { task_environment_.RunUntilIdle(); }
PasswordForm MakeSimpleForm(int id) {
PasswordForm form;
@@ -76,7 +76,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<TestPasswordStore> store_;
std::unique_ptr<TestingPrefServiceSimple> prefs_;
};
diff --git a/components/password_manager/core/browser/password_manager_unittest.cc b/components/password_manager/core/browser/password_manager_unittest.cc
index c26555f5..4429e60 100644
--- a/components/password_manager/core/browser/password_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_manager_unittest.cc
@@ -518,7 +518,7 @@
}
const GURL test_url_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockPasswordStore> store_;
testing::NiceMock<MockPasswordManagerClient> client_;
MockPasswordManagerDriver driver_;
diff --git a/components/password_manager/core/browser/password_reuse_detection_manager_unittest.cc b/components/password_manager/core/browser/password_reuse_detection_manager_unittest.cc
index d46fbe5c..dc11af29 100644
--- a/components/password_manager/core/browser/password_reuse_detection_manager_unittest.cc
+++ b/components/password_manager/core/browser/password_reuse_detection_manager_unittest.cc
@@ -52,7 +52,7 @@
protected:
// It's needed for an initialisation of thread runners that are used in
// MockPasswordStore.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockPasswordManagerClient client_;
scoped_refptr<MockPasswordStore> store_;
diff --git a/components/password_manager/core/browser/password_store_default_unittest.cc b/components/password_manager/core/browser/password_store_default_unittest.cc
index 88e8a5f..22a7388 100644
--- a/components/password_manager/core/browser/password_store_default_unittest.cc
+++ b/components/password_manager/core/browser/password_store_default_unittest.cc
@@ -97,7 +97,7 @@
base::FilePath test_login_db_file_path() const;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
scoped_refptr<PasswordStoreDefault> store_;
@@ -105,8 +105,7 @@
};
PasswordStoreDefaultTestDelegate::PasswordStoreDefaultTestDelegate()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
OSCryptMocker::SetUp();
SetupTempDir();
store_ = CreateInitializedStore(
@@ -115,8 +114,7 @@
PasswordStoreDefaultTestDelegate::PasswordStoreDefaultTestDelegate(
std::unique_ptr<LoginDatabase> database)
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
OSCryptMocker::SetUp();
SetupTempDir();
store_ = CreateInitializedStore(std::move(database));
@@ -128,7 +126,7 @@
}
void PasswordStoreDefaultTestDelegate::FinishAsyncProcessing() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void PasswordStoreDefaultTestDelegate::SetupTempDir() {
diff --git a/components/password_manager/core/browser/password_store_unittest.cc b/components/password_manager/core/browser/password_store_unittest.cc
index 5391763..157307c 100644
--- a/components/password_manager/core/browser/password_store_unittest.cc
+++ b/components/password_manager/core/browser/password_store_unittest.cc
@@ -109,8 +109,7 @@
class PasswordStoreTest : public testing::Test {
protected:
PasswordStoreTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -123,7 +122,7 @@
OSCryptMocker::TearDown();
}
- void WaitForPasswordStore() { scoped_task_environment_.RunUntilIdle(); }
+ void WaitForPasswordStore() { task_environment_.RunUntilIdle(); }
base::FilePath test_login_db_file_path() const {
return temp_dir_.GetPath().Append(FILE_PATH_LITERAL("login_test"));
@@ -131,7 +130,7 @@
private:
base::ScopedTempDir temp_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(PasswordStoreTest);
};
diff --git a/components/password_manager/core/browser/sync/password_syncable_service_unittest.cc b/components/password_manager/core/browser/sync/password_syncable_service_unittest.cc
index 0b0abb5a6..44078521 100644
--- a/components/password_manager/core/browser/sync/password_syncable_service_unittest.cc
+++ b/components/password_manager/core/browser/sync/password_syncable_service_unittest.cc
@@ -230,7 +230,7 @@
private:
// Used by the password store.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
PasswordSyncableServiceWrapper wrapper_;
};
diff --git a/components/password_manager/core/browser/sync_username_test_base.h b/components/password_manager/core/browser/sync_username_test_base.h
index 440b998..ba243920 100644
--- a/components/password_manager/core/browser/sync_username_test_base.h
+++ b/components/password_manager/core/browser/sync_username_test_base.h
@@ -43,7 +43,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_env_;
+ base::test::TaskEnvironment scoped_task_env_;
signin::IdentityTestEnvironment identity_test_env_;
syncer::TestSyncService sync_service_;
};
diff --git a/components/password_manager/core/browser/votes_uploader_unittest.cc b/components/password_manager/core/browser/votes_uploader_unittest.cc
index 9643c8e..87b38a00 100644
--- a/components/password_manager/core/browser/votes_uploader_unittest.cc
+++ b/components/password_manager/core/browser/votes_uploader_unittest.cc
@@ -107,7 +107,7 @@
return ASCIIToUTF16("field") + base::NumberToString16(index);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockAutofillDownloadManager mock_autofill_download_manager_;
MockPasswordManagerClient client_;
diff --git a/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc b/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc
index e4d9945e..bb83750 100644
--- a/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc
+++ b/components/password_manager/core/common/passwords_directory_util_ios_unittest.cc
@@ -12,7 +12,7 @@
// Tests that DeletePasswordsDirectory() actually deletes the directory.
TEST(PasswordsDirectoryUtilTest, Deletion) {
- base::test::ScopedTaskEnvironment environment;
+ base::test::TaskEnvironment environment;
base::FilePath dir;
ASSERT_TRUE(password_manager::GetPasswordsDirectory(&dir));
ASSERT_TRUE(CreateDirectory(dir));
diff --git a/components/payments/core/can_make_payment_query_unittest.cc b/components/payments/core/can_make_payment_query_unittest.cc
index c7be1ff..63db448 100644
--- a/components/payments/core/can_make_payment_query_unittest.cc
+++ b/components/payments/core/can_make_payment_query_unittest.cc
@@ -16,7 +16,7 @@
CanMakePaymentQuery guard_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// An HTTPS website is not allowed to query all of the networks of the cards in
diff --git a/components/payments/core/journey_logger_unittest.cc b/components/payments/core/journey_logger_unittest.cc
index 348f582..25939971 100644
--- a/components/payments/core/journey_logger_unittest.cc
+++ b/components/payments/core/journey_logger_unittest.cc
@@ -931,7 +931,7 @@
// the Payment Request.
TEST(JourneyLoggerTest,
RecordJourneyStatsHistograms_CheckoutFunnelUkm_UserAborted) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using UkmEntry = ukm::builders::PaymentRequest_CheckoutEvents;
ukm::TestAutoSetUkmRecorder ukm_recorder;
char test_url[] = "http://www.google.com/";
@@ -982,7 +982,7 @@
// completes the Payment Request.
TEST(JourneyLoggerTest,
RecordJourneyStatsHistograms_CheckoutFunnelUkm_Completed) {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using UkmEntry = ukm::builders::PaymentRequest_CheckoutEvents;
ukm::TestAutoSetUkmRecorder ukm_recorder;
char test_url[] = "http://www.google.com/";
diff --git a/components/payments/core/payment_manifest_downloader_unittest.cc b/components/payments/core/payment_manifest_downloader_unittest.cc
index b460cb7..4138e3b 100644
--- a/components/payments/core/payment_manifest_downloader_unittest.cc
+++ b/components/payments/core/payment_manifest_downloader_unittest.cc
@@ -84,7 +84,7 @@
private:
GURL test_url_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
PaymentManifestDownloader downloader_;
@@ -381,7 +381,7 @@
private:
GURL test_url_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory_;
PaymentManifestDownloader downloader_;
diff --git a/components/policy/core/browser/configuration_policy_pref_store_test.h b/components/policy/core/browser/configuration_policy_pref_store_test.h
index bad9c61..f0c8ba63 100644
--- a/components/policy/core/browser/configuration_policy_pref_store_test.h
+++ b/components/policy/core/browser/configuration_policy_pref_store_test.h
@@ -38,7 +38,7 @@
MockConfigurationPolicyProvider provider_;
std::unique_ptr<PolicyServiceImpl> policy_service_;
scoped_refptr<ConfigurationPolicyPrefStore> store_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyPrefStoreTest);
diff --git a/components/policy/core/browser/url_blacklist_manager_unittest.cc b/components/policy/core/browser/url_blacklist_manager_unittest.cc
index 0930f96..236ddaf8 100644
--- a/components/policy/core/browser/url_blacklist_manager_unittest.cc
+++ b/components/policy/core/browser/url_blacklist_manager_unittest.cc
@@ -70,19 +70,19 @@
pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist);
pref_service_.registry()->RegisterListPref(policy_prefs::kUrlWhitelist);
blacklist_manager_.reset(new TestingURLBlacklistManager(&pref_service_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void TearDown() override {
if (blacklist_manager_)
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
blacklist_manager_.reset();
}
TestingPrefServiceSimple pref_service_;
std::unique_ptr<TestingURLBlacklistManager> blacklist_manager_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Parameters for the FilterToComponents test.
@@ -209,7 +209,7 @@
list->AppendString("example.com");
pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist, std::move(list));
auto manager = std::make_unique<URLBlacklistManager>(&pref_service_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(URLBlacklist::URL_IN_BLACKLIST,
manager->GetURLBlacklistState(GURL("http://example.com")));
}
@@ -219,7 +219,7 @@
list->AppendString("example.com");
pref_service_.SetManagedPref(policy_prefs::kUrlWhitelist, std::move(list));
auto manager = std::make_unique<URLBlacklistManager>(&pref_service_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(URLBlacklist::URL_IN_WHITELIST,
manager->GetURLBlacklistState(GURL("http://example.com")));
}
@@ -233,7 +233,7 @@
std::move(blacklist));
pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist,
std::move(whitelist));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1, blacklist_manager_->update_called());
}
diff --git a/components/policy/core/common/async_policy_provider_unittest.cc b/components/policy/core/common/async_policy_provider_unittest.cc
index cc845b2a..70c9524 100644
--- a/components/policy/core/common/async_policy_provider_unittest.cc
+++ b/components/policy/core/common/async_policy_provider_unittest.cc
@@ -84,7 +84,7 @@
void SetUp() override;
void TearDown() override;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
SchemaRegistry schema_registry_;
PolicyBundle initial_bundle_;
MockPolicyLoader* loader_;
diff --git a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
index ed54943..639cdb7 100644
--- a/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_client_unittest.cc
@@ -589,7 +589,7 @@
em::DeviceManagementResponse upload_app_install_report_response_;
em::DeviceManagementResponse upload_policy_validation_report_response_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DeviceManagementService::JobConfiguration::JobType job_type_;
DeviceManagementService::JobConfiguration::ParameterMap query_params_;
em::DeviceManagementRequest job_request_;
diff --git a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
index 5082a02..457f9f6 100644
--- a/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_core_unittest.cc
@@ -64,7 +64,7 @@
bad_callback_count_++;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple prefs_;
MockCloudPolicyStore store_;
diff --git a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
index 369939b1..b273826 100644
--- a/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_manager_unittest.cc
@@ -185,7 +185,7 @@
EXPECT_CALL(store_, Load());
manager_.reset(new TestCloudPolicyManager(
- &store_, scoped_task_environment_.GetMainThreadTaskRunner()));
+ &store_, task_environment_.GetMainThreadTaskRunner()));
manager_->Init(&schema_registry_);
Mock::VerifyAndClearExpectations(&store_);
manager_->AddObserver(&observer_);
@@ -197,7 +197,7 @@
}
// Needs to be the first member.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Testing policy.
const std::string policy_type_;
diff --git a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
index f98850e..82b90097 100644
--- a/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_refresh_scheduler_unittest.cc
@@ -168,7 +168,7 @@
last_update_ticks_ = base::TimeTicks::Now();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockCloudPolicyClient client_;
MockCloudPolicyStore store_;
std::unique_ptr<MockCloudPolicyService> service_;
diff --git a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
index 0f03aba2..8c02ffa 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
+++ b/components/policy/core/common/cloud/cloud_policy_validator_unittest.cc
@@ -57,8 +57,7 @@
class CloudPolicyValidatorTest : public testing::Test {
public:
CloudPolicyValidatorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
timestamp_(base::Time::FromJavaTime(PolicyBuilder::kFakeTimestamp)),
timestamp_option_(CloudPolicyValidatorBase::TIMESTAMP_VALIDATED),
dm_token_option_(CloudPolicyValidatorBase::DM_TOKEN_REQUIRED),
@@ -154,7 +153,7 @@
EXPECT_EQ(kMessage, result.message);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Time timestamp_;
CloudPolicyValidatorBase::ValidateTimestampOption timestamp_option_;
CloudPolicyValidatorBase::ValidateDMTokenOption dm_token_option_;
diff --git a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
index e576757..f32010f 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_service_unittest.cc
@@ -222,7 +222,7 @@
const PolicyNamespace kTestExtensionNS2 =
PolicyNamespace(POLICY_DOMAIN_EXTENSIONS, kTestExtension2);
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
network::TestURLLoaderFactory loader_factory_;
MockComponentCloudPolicyDelegate delegate_;
diff --git a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
index cc079834..cc93b95 100644
--- a/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
+++ b/components/policy/core/common/cloud/component_cloud_policy_updater_unittest.cc
@@ -80,7 +80,7 @@
std::unique_ptr<em::PolicyFetchResponse> CreateResponse();
const PolicyNamespace kTestPolicyNS{POLICY_DOMAIN_EXTENSIONS, kTestExtension};
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
std::unique_ptr<ComponentCloudPolicyStore> store_;
MockComponentCloudPolicyStoreDelegate store_delegate_;
network::TestURLLoaderFactory loader_factory_;
@@ -96,7 +96,7 @@
};
ComponentCloudPolicyUpdaterTest::ComponentCloudPolicyUpdaterTest()
- : task_env_(base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {
+ : task_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {
builder_.SetDefaultSigningKey();
builder_.policy_data().set_policy_type(
dm_protocol::kChromeExtensionPolicyType);
diff --git a/components/policy/core/common/cloud/device_management_service_unittest.cc b/components/policy/core/common/cloud/device_management_service_unittest.cc
index 2a37abac..0b37ae7 100644
--- a/components/policy/core/common/cloud/device_management_service_unittest.cc
+++ b/components/policy/core/common/cloud/device_management_service_unittest.cc
@@ -242,7 +242,7 @@
MOCK_METHOD0(OnJobRetry, void());
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory url_loader_factory_;
scoped_refptr<network::WeakWrapperSharedURLLoaderFactory>
shared_url_loader_factory_;
diff --git a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
index 35ef7e18..b93cae3 100644
--- a/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_fetcher_unittest.cc
@@ -52,7 +52,7 @@
std::unique_ptr<std::string> data);
int GetAndResetCallbackCount();
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::TestSimpleTaskRunner> owner_task_runner_;
network::TestURLLoaderFactory test_url_loader_factory_;
std::unique_ptr<ExternalPolicyDataFetcherBackend> fetcher_backend_;
diff --git a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
index 465b6e7..713160a5 100644
--- a/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
+++ b/components/policy/core/common/cloud/external_policy_data_updater_unittest.cc
@@ -73,7 +73,7 @@
void RequestExternalDataFetch(int key_index, int url_index);
void RequestExternalDataFetch(int index);
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
MockFetchSuccessCallbackListener callback_listener_;
scoped_refptr<base::TestSimpleTaskRunner> backend_task_runner_;
diff --git a/components/policy/core/common/cloud/machine_level_user_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/machine_level_user_cloud_policy_store_unittest.cc
index 239803d..1374777e 100644
--- a/components/policy/core/common/cloud/machine_level_user_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/machine_level_user_cloud_policy_store_unittest.cc
@@ -26,8 +26,7 @@
class MachineLevelUserCloudPolicyStoreTest : public ::testing::Test {
public:
MachineLevelUserCloudPolicyStoreTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
policy_.SetDefaultInitialSigningKey();
policy_.policy_data().set_policy_type(
dm_protocol::kChromeMachineLevelUserCloudPolicyType);
@@ -74,7 +73,7 @@
PolicyMap expected_policy_map_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(MachineLevelUserCloudPolicyStoreTest);
};
diff --git a/components/policy/core/common/cloud/resource_cache_unittest.cc b/components/policy/core/common/cloud/resource_cache_unittest.cc
index feddcbb..7f302f6 100644
--- a/components/policy/core/common/cloud/resource_cache_unittest.cc
+++ b/components/policy/core/common/cloud/resource_cache_unittest.cc
@@ -51,7 +51,7 @@
void TearDown() override { task_environment_.RunUntilIdle(); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
};
diff --git a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
index 656054fe..3559fdc 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_manager_unittest.cc
@@ -51,7 +51,7 @@
void CreateManager() {
store_ = new MockUserCloudPolicyStore();
EXPECT_CALL(*store_, Load());
- const auto task_runner = scoped_task_environment_.GetMainThreadTaskRunner();
+ const auto task_runner = task_environment_.GetMainThreadTaskRunner();
manager_.reset(new UserCloudPolicyManager(
std::unique_ptr<UserCloudPolicyStore>(store_), base::FilePath(),
std::unique_ptr<CloudExternalDataManager>(), task_runner,
@@ -62,7 +62,7 @@
}
// Needs to be the first member.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Convenience policy objects.
PolicyMap policy_map_;
diff --git a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
index 4476a6c..9f82002 100644
--- a/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
+++ b/components/policy/core/common/cloud/user_cloud_policy_store_unittest.cc
@@ -55,8 +55,7 @@
class UserCloudPolicyStoreTest : public testing::Test {
public:
UserCloudPolicyStoreTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
ASSERT_TRUE(tmp_dir_.CreateUniqueTempDir());
@@ -135,7 +134,7 @@
std::unique_ptr<UserCloudPolicyStore> store_;
std::unique_ptr<MockCloudExternalDataManager> external_data_manager_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir tmp_dir_;
diff --git a/components/policy/core/common/cloud/user_info_fetcher_unittest.cc b/components/policy/core/common/cloud/user_info_fetcher_unittest.cc
index 3e81cb9..54f174be 100644
--- a/components/policy/core/common/cloud/user_info_fetcher_unittest.cc
+++ b/components/policy/core/common/cloud/user_info_fetcher_unittest.cc
@@ -47,7 +47,7 @@
~UserInfoFetcherTest() override = default;
protected:
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
network::TestURLLoaderFactory loader_factory_;
DISALLOW_COPY_AND_ASSIGN(UserInfoFetcherTest);
diff --git a/components/policy/core/common/config_dir_policy_loader_unittest.cc b/components/policy/core/common/config_dir_policy_loader_unittest.cc
index 4a50c9b..51f7f50 100644
--- a/components/policy/core/common/config_dir_policy_loader_unittest.cc
+++ b/components/policy/core/common/config_dir_policy_loader_unittest.cc
@@ -190,9 +190,8 @@
// The preferences dictionary is expected to be empty when there are no files to
// load.
TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsEmpty) {
- ConfigDirPolicyLoader loader(
- scoped_task_environment_.GetMainThreadTaskRunner(), harness_.test_dir(),
- POLICY_SCOPE_MACHINE);
+ ConfigDirPolicyLoader loader(task_environment_.GetMainThreadTaskRunner(),
+ harness_.test_dir(), POLICY_SCOPE_MACHINE);
std::unique_ptr<PolicyBundle> bundle(loader.Load());
ASSERT_TRUE(bundle.get());
const PolicyBundle kEmptyBundle;
@@ -204,9 +203,8 @@
TEST_F(ConfigDirPolicyLoaderTest, ReadPrefsNonExistentDirectory) {
base::FilePath non_existent_dir(
harness_.test_dir().Append(FILE_PATH_LITERAL("not_there")));
- ConfigDirPolicyLoader loader(
- scoped_task_environment_.GetMainThreadTaskRunner(), non_existent_dir,
- POLICY_SCOPE_MACHINE);
+ ConfigDirPolicyLoader loader(task_environment_.GetMainThreadTaskRunner(),
+ non_existent_dir, POLICY_SCOPE_MACHINE);
std::unique_ptr<PolicyBundle> bundle(loader.Load());
ASSERT_TRUE(bundle.get());
const PolicyBundle kEmptyBundle;
@@ -230,9 +228,8 @@
for (unsigned int i = 5; i <= 8; ++i)
harness_.WriteConfigFile(test_dict_bar, base::NumberToString(i));
- ConfigDirPolicyLoader loader(
- scoped_task_environment_.GetMainThreadTaskRunner(), harness_.test_dir(),
- POLICY_SCOPE_USER);
+ ConfigDirPolicyLoader loader(task_environment_.GetMainThreadTaskRunner(),
+ harness_.test_dir(), POLICY_SCOPE_USER);
std::unique_ptr<PolicyBundle> bundle(loader.Load());
ASSERT_TRUE(bundle.get());
PolicyBundle expected_bundle;
diff --git a/components/policy/core/common/configuration_policy_provider_test.cc b/components/policy/core/common/configuration_policy_provider_test.cc
index 9fbbeb5..fc015fcf 100644
--- a/components/policy/core/common/configuration_policy_provider_test.cc
+++ b/components/policy/core/common/configuration_policy_provider_test.cc
@@ -136,7 +136,7 @@
}
void PolicyTestBase::TearDown() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
bool PolicyTestBase::RegisterSchema(const PolicyNamespace& ns,
@@ -209,7 +209,7 @@
provider_->Init(&schema_registry_);
// Some providers do a reload on init. Make sure any notifications generated
// are fired now.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const PolicyBundle kEmptyBundle;
EXPECT_TRUE(provider_->policies().Equals(kEmptyBundle));
@@ -230,7 +230,7 @@
// Install the value, reload policy and check the provider for the value.
install_value.Run();
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
PolicyBundle expected_bundle;
expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(policy_name, test_harness_->policy_level(),
@@ -243,7 +243,7 @@
TEST_P(ConfigurationPolicyProviderTest, Empty) {
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const PolicyBundle kEmptyBundle;
EXPECT_TRUE(provider_->policies().Equals(kEmptyBundle));
}
@@ -334,7 +334,7 @@
provider_->AddObserver(&observer);
EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(1);
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
EXPECT_TRUE(provider_->policies().Equals(bundle));
@@ -343,7 +343,7 @@
test_harness_->InstallStringPolicy(test_keys::kKeyString, "value");
EXPECT_CALL(observer, OnUpdatePolicy(provider_.get())).Times(1);
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Mock::VerifyAndClearExpectations(&observer);
bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
@@ -364,7 +364,7 @@
EXPECT_CALL(*migrator, Migrate(_));
provider_->AddMigrator(std::unique_ptr<ExtensionPolicyMigrator>(migrator));
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
Configuration3rdPartyPolicyProviderTest::
@@ -407,7 +407,7 @@
test_harness_->Install3rdPartyPolicy(&policy_3rdparty);
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
PolicyMap expected_policy;
expected_policy.Set(test_keys::kKeyDictionary, test_harness_->policy_level(),
diff --git a/components/policy/core/common/configuration_policy_provider_test.h b/components/policy/core/common/configuration_policy_provider_test.h
index 0d314b3..9b7c765 100644
--- a/components/policy/core/common/configuration_policy_provider_test.h
+++ b/components/policy/core/common/configuration_policy_provider_test.h
@@ -53,7 +53,7 @@
const std::string& schema);
// Needs to be the first member
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
SchemaRegistry schema_registry_;
private:
diff --git a/components/policy/core/common/policy_loader_mac_unittest.cc b/components/policy/core/common/policy_loader_mac_unittest.cc
index b579ac2..846af796 100644
--- a/components/policy/core/common/policy_loader_mac_unittest.cc
+++ b/components/policy/core/common/policy_loader_mac_unittest.cc
@@ -148,9 +148,8 @@
void SetUp() override {
PolicyTestBase::SetUp();
- std::unique_ptr<AsyncPolicyLoader> loader(
- new PolicyLoaderMac(scoped_task_environment_.GetMainThreadTaskRunner(),
- base::FilePath(), prefs_));
+ std::unique_ptr<AsyncPolicyLoader> loader(new PolicyLoaderMac(
+ task_environment_.GetMainThreadTaskRunner(), base::FilePath(), prefs_));
provider_.reset(
new AsyncPolicyProvider(&schema_registry_, std::move(loader)));
provider_->Init(&schema_registry_);
@@ -178,7 +177,7 @@
// Make the provider read the updated |prefs_|.
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const PolicyBundle kEmptyBundle;
EXPECT_TRUE(provider_->policies().Equals(kEmptyBundle));
}
@@ -193,7 +192,7 @@
// Make the provider read the updated |prefs_|.
provider_->RefreshPolicies();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
PolicyBundle expected_bundle;
expected_bundle.Get(PolicyNamespace(POLICY_DOMAIN_CHROME, std::string()))
.Set(test_keys::kKeyString, POLICY_LEVEL_RECOMMENDED,
diff --git a/components/policy/core/common/policy_loader_win_unittest.cc b/components/policy/core/common/policy_loader_win_unittest.cc
index e05e75f8..6fd6a14 100644
--- a/components/policy/core/common/policy_loader_win_unittest.cc
+++ b/components/policy/core/common/policy_loader_win_unittest.cc
@@ -426,7 +426,7 @@
}
bool Matches(const PolicyBundle& expected) {
- PolicyLoaderWin loader(scoped_task_environment_.GetMainThreadTaskRunner(),
+ PolicyLoaderWin loader(task_environment_.GetMainThreadTaskRunner(),
kTestPolicyKey);
std::unique_ptr<PolicyBundle> loaded(
loader.InitialLoad(schema_registry_.schema_map()));
diff --git a/components/policy/core/common/policy_scheduler_unittest.cc b/components/policy/core/common/policy_scheduler_unittest.cc
index 2950f3f..20160f1 100644
--- a/components/policy/core/common/policy_scheduler_unittest.cc
+++ b/components/policy/core/common/policy_scheduler_unittest.cc
@@ -54,7 +54,7 @@
PolicyScheduler::TaskCallback slow_callback_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PolicySchedulerTest, Run) {
diff --git a/components/policy/core/common/policy_service_impl_unittest.cc b/components/policy/core/common/policy_service_impl_unittest.cc
index 5e2fe42..7bf0de0 100644
--- a/components/policy/core/common/policy_service_impl_unittest.cc
+++ b/components/policy/core/common/policy_service_impl_unittest.cc
@@ -151,7 +151,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockConfigurationPolicyProvider provider0_;
MockConfigurationPolicyProvider provider1_;
MockConfigurationPolicyProvider provider2_;
diff --git a/components/prefs/in_memory_pref_store_unittest.cc b/components/prefs/in_memory_pref_store_unittest.cc
index b2b6780..f8382bf7 100644
--- a/components/prefs/in_memory_pref_store_unittest.cc
+++ b/components/prefs/in_memory_pref_store_unittest.cc
@@ -22,7 +22,7 @@
void SetUp() override { store_ = new InMemoryPrefStore(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<InMemoryPrefStore> store_;
PrefStoreObserverMock observer_;
};
@@ -107,7 +107,7 @@
}
TEST_F(InMemoryPrefStoreTest, CommitPendingWriteWithCallback) {
- TestCommitPendingWriteWithCallback(store_.get(), &scoped_task_environment_);
+ TestCommitPendingWriteWithCallback(store_.get(), &task_environment_);
}
} // namespace
diff --git a/components/prefs/json_pref_store_unittest.cc b/components/prefs/json_pref_store_unittest.cc
index 8ba14d16..c25ca9c 100644
--- a/components/prefs/json_pref_store_unittest.cc
+++ b/components/prefs/json_pref_store_unittest.cc
@@ -134,31 +134,30 @@
WITH_SYNCHRONOUS_CALLBACK,
};
-base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode GetExecutionMode(
+base::test::TaskEnvironment::ThreadPoolExecutionMode GetExecutionMode(
CommitPendingWriteMode commit_mode) {
switch (commit_mode) {
case CommitPendingWriteMode::WITHOUT_CALLBACK:
FALLTHROUGH;
case CommitPendingWriteMode::WITH_CALLBACK:
- return base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED;
+ return base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED;
case CommitPendingWriteMode::WITH_SYNCHRONOUS_CALLBACK:
// Synchronous callbacks require async tasks to run on their own.
- return base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC;
+ return base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC;
}
}
-void CommitPendingWrite(
- JsonPrefStore* pref_store,
- CommitPendingWriteMode commit_pending_write_mode,
- base::test::ScopedTaskEnvironment* scoped_task_environment) {
+void CommitPendingWrite(JsonPrefStore* pref_store,
+ CommitPendingWriteMode commit_pending_write_mode,
+ base::test::TaskEnvironment* task_environment) {
switch (commit_pending_write_mode) {
case CommitPendingWriteMode::WITHOUT_CALLBACK: {
pref_store->CommitPendingWrite();
- scoped_task_environment->RunUntilIdle();
+ task_environment->RunUntilIdle();
break;
}
case CommitPendingWriteMode::WITH_CALLBACK: {
- TestCommitPendingWriteWithCallback(pref_store, scoped_task_environment);
+ TestCommitPendingWriteWithCallback(pref_store, task_environment);
break;
}
case CommitPendingWriteMode::WITH_SYNCHRONOUS_CALLBACK: {
@@ -176,16 +175,15 @@
: public testing::TestWithParam<CommitPendingWriteMode> {
public:
JsonPrefStoreTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- GetExecutionMode(GetParam())) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ GetExecutionMode(GetParam())) {}
protected:
void SetUp() override {
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The path to temporary directory used to contain the test operations.
base::ScopedTempDir temp_dir_;
@@ -229,11 +227,10 @@
// This function is used to avoid code duplication while testing synchronous
// and asynchronous version of the JsonPrefStore loading. It validates that the
// given output file's contents matches kWriteGolden.
-void RunBasicJsonPrefStoreTest(
- JsonPrefStore* pref_store,
- const base::FilePath& output_file,
- CommitPendingWriteMode commit_pending_write_mode,
- base::test::ScopedTaskEnvironment* scoped_task_environment) {
+void RunBasicJsonPrefStoreTest(JsonPrefStore* pref_store,
+ const base::FilePath& output_file,
+ CommitPendingWriteMode commit_pending_write_mode,
+ base::test::TaskEnvironment* task_environment) {
const char kNewWindowsInTabs[] = "tabs.new_windows_in_tabs";
const char kMaxTabs[] = "tabs.max_tabs";
const char kLongIntPref[] = "long_int.pref";
@@ -294,8 +291,7 @@
EXPECT_EQ(214748364842LL, value);
// Serialize and compare to expected output.
- CommitPendingWrite(pref_store, commit_pending_write_mode,
- scoped_task_environment);
+ CommitPendingWrite(pref_store, commit_pending_write_mode, task_environment);
std::string output_contents;
ASSERT_TRUE(base::ReadFileToString(output_file, &output_contents));
@@ -326,7 +322,7 @@
// }
RunBasicJsonPrefStoreTest(pref_store.get(), input_file, GetParam(),
- &scoped_task_environment_);
+ &task_environment_);
}
TEST_P(JsonPrefStoreTest, BasicAsync) {
@@ -347,7 +343,7 @@
EXPECT_CALL(mock_observer, OnInitializationCompleted(true)).Times(1);
EXPECT_CALL(*mock_error_delegate,
OnError(PersistentPrefStore::PREF_READ_ERROR_NONE)).Times(0);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
pref_store->RemoveObserver(&mock_observer);
EXPECT_FALSE(pref_store->ReadOnly());
@@ -365,7 +361,7 @@
// }
RunBasicJsonPrefStoreTest(pref_store.get(), input_file, GetParam(),
- &scoped_task_environment_);
+ &task_environment_);
}
TEST_P(JsonPrefStoreTest, PreserveEmptyValues) {
@@ -380,7 +376,7 @@
WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);
// Write to file.
- CommitPendingWrite(pref_store.get(), GetParam(), &scoped_task_environment_);
+ CommitPendingWrite(pref_store.get(), GetParam(), &task_environment_);
// Reload.
pref_store = base::MakeRefCounted<JsonPrefStore>(pref_file);
@@ -429,7 +425,7 @@
EXPECT_CALL(mock_observer, OnInitializationCompleted(true)).Times(1);
EXPECT_CALL(*mock_error_delegate,
OnError(PersistentPrefStore::PREF_READ_ERROR_NO_FILE)).Times(1);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
pref_store->RemoveObserver(&mock_observer);
EXPECT_FALSE(pref_store->ReadOnly());
@@ -474,7 +470,7 @@
// }
RunBasicJsonPrefStoreTest(pref_store.get(), input_file, GetParam(),
- &scoped_task_environment_);
+ &task_environment_);
}
TEST_P(JsonPrefStoreTest, ReadAsyncWithInterceptor) {
@@ -501,7 +497,7 @@
EXPECT_CALL(mock_observer, OnInitializationCompleted(true)).Times(0);
// EXPECT_CALL(*mock_error_delegate,
// OnError(PersistentPrefStore::PREF_READ_ERROR_NONE)).Times(0);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(pref_store->ReadOnly());
EXPECT_TRUE(raw_intercepting_pref_filter_->has_intercepted_prefs());
@@ -535,7 +531,7 @@
// }
RunBasicJsonPrefStoreTest(pref_store.get(), input_file, GetParam(),
- &scoped_task_environment_);
+ &task_environment_);
}
INSTANTIATE_TEST_SUITE_P(
@@ -573,7 +569,7 @@
// Get the contents of kTestFile. Pumps the message loop before returning the
// result.
std::string GetTestFileContents() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::string file_contents;
ReadFileToString(test_file_, &file_contents);
return file_contents;
@@ -836,9 +832,9 @@
WriteCallbacksObserver write_callback_observer_;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED};
base::ScopedTempDir temp_dir_;
@@ -870,7 +866,7 @@
EXPECT_EQ(NOT_CALLED,
write_callback_observer_.GetAndResetPostWriteObservationState());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
@@ -886,7 +882,7 @@
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
write_callback_observer_.ObserveNextWriteCallback(pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_TRUE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
@@ -897,7 +893,7 @@
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
write_callback_observer_.ObserveNextWriteCallback(pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_TRUE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
@@ -906,7 +902,7 @@
// Test RegisterOnNextSuccessfulWriteReply only.
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_FALSE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(NOT_CALLED,
@@ -915,7 +911,7 @@
// Test RegisterOnNextWriteSynchronousCallbacks only.
write_callback_observer_.ObserveNextWriteCallback(pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_TRUE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
@@ -928,7 +924,7 @@
// Confirm that the observers are invoked.
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
TriggerFakeWriteForCallback(pref_store.get(), true);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
write_callback_observer_.GetAndResetPostWriteObservationState());
@@ -941,7 +937,7 @@
// Confirm that re-installing the observers works for another write.
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
TriggerFakeWriteForCallback(pref_store.get(), true);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
write_callback_observer_.GetAndResetPostWriteObservationState());
@@ -950,7 +946,7 @@
// write, and that the synchronous observer is invoked.
successful_write_reply_observer_.ObserveNextWriteCallback(pref_store.get());
TriggerFakeWriteForCallback(pref_store.get(), false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_EQ(CALLED_WITH_ERROR,
write_callback_observer_.GetAndResetPostWriteObservationState());
@@ -959,7 +955,7 @@
// being set by |PostWriteCallback| by the last TriggerFakeWriteCallback.
ImportantFileWriter* file_writer = GetImportantFileWriter(pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_EQ(NOT_CALLED,
write_callback_observer_.GetAndResetPostWriteObservationState());
@@ -979,7 +975,7 @@
soon_out_of_scope_pref_store.get());
file_writer->WriteNow(std::make_unique<std::string>("foo"));
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(successful_write_reply_observer_.GetAndResetObservationState());
EXPECT_TRUE(write_callback_observer_.GetAndResetPreWriteObservationState());
EXPECT_EQ(CALLED_WITH_SUCCESS,
diff --git a/components/prefs/overlay_user_pref_store_unittest.cc b/components/prefs/overlay_user_pref_store_unittest.cc
index 5f0d725..2d38f71c 100644
--- a/components/prefs/overlay_user_pref_store_unittest.cc
+++ b/components/prefs/overlay_user_pref_store_unittest.cc
@@ -40,7 +40,7 @@
~OverlayUserPrefStoreTest() override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<TestingPrefStore> underlay_;
scoped_refptr<OverlayUserPrefStore> overlay_;
};
@@ -275,7 +275,7 @@
}
TEST_F(OverlayUserPrefStoreTest, CommitPendingWriteWithCallback) {
- TestCommitPendingWriteWithCallback(overlay_.get(), &scoped_task_environment_);
+ TestCommitPendingWriteWithCallback(overlay_.get(), &task_environment_);
}
} // namespace base
diff --git a/components/prefs/persistent_pref_store_unittest.cc b/components/prefs/persistent_pref_store_unittest.cc
index d297858..fe9a418 100644
--- a/components/prefs/persistent_pref_store_unittest.cc
+++ b/components/prefs/persistent_pref_store_unittest.cc
@@ -12,7 +12,7 @@
void TestCommitPendingWriteWithCallback(
PersistentPrefStore* store,
- base::test::ScopedTaskEnvironment* scoped_task_environment) {
+ base::test::TaskEnvironment* task_environment) {
base::RunLoop run_loop;
base::SequenceCheckerImpl sequence_checker;
store->CommitPendingWrite(base::BindOnce(
@@ -21,6 +21,6 @@
run_loop->Quit();
},
base::Unretained(&sequence_checker), base::Unretained(&run_loop)));
- scoped_task_environment->RunUntilIdle();
+ task_environment->RunUntilIdle();
run_loop.Run();
}
diff --git a/components/prefs/persistent_pref_store_unittest.h b/components/prefs/persistent_pref_store_unittest.h
index ea658e1..121f942 100644
--- a/components/prefs/persistent_pref_store_unittest.h
+++ b/components/prefs/persistent_pref_store_unittest.h
@@ -7,18 +7,18 @@
namespace base {
namespace test {
-class ScopedTaskEnvironment;
+class TaskEnvironment;
}
} // namespace base
class PersistentPrefStore;
// Calls CommitPendingWrite() on |store| with a callback. Verifies that the
-// callback runs on the appropriate sequence. |scoped_task_environment| is the
-// test's ScopedTaskEnvironment. This function is meant to be reused in the
+// callback runs on the appropriate sequence. |task_environment| is the
+// test's TaskEnvironment. This function is meant to be reused in the
// tests of various PersistentPrefStore implementations.
void TestCommitPendingWriteWithCallback(
PersistentPrefStore* store,
- base::test::ScopedTaskEnvironment* scoped_task_environment);
+ base::test::TaskEnvironment* task_environment);
#endif // COMPONENTS_PREFS_PERSISTENT_PREF_STORE_UNITTEST_H_
diff --git a/components/prefs/pref_member_unittest.cc b/components/prefs/pref_member_unittest.cc
index 420d24b..28e2a4a 100644
--- a/components/prefs/pref_member_unittest.cc
+++ b/components/prefs/pref_member_unittest.cc
@@ -100,7 +100,7 @@
} // anonymous namespace
class PrefMemberTest : public testing::Test {
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PrefMemberTest, BasicGetAndSet) {
diff --git a/components/previews/content/previews_decider_impl_unittest.cc b/components/previews/content/previews_decider_impl_unittest.cc
index bdbe9ca..4e08ed7 100644
--- a/components/previews/content/previews_decider_impl_unittest.cc
+++ b/components/previews/content/previews_decider_impl_unittest.cc
@@ -396,7 +396,7 @@
: field_trial_list_(nullptr),
previews_decider_impl_(nullptr),
optimization_guide_service_(
- scoped_task_environment_.GetMainThreadTaskRunner()) {
+ task_environment_.GetMainThreadTaskRunner()) {
clock_.SetNow(base::Time::Now());
network_quality_tracker_.ReportEffectiveConnectionTypeForTesting(
@@ -438,7 +438,7 @@
std::move(previews_decider_impl), std::make_unique<TestOptOutStore>(),
std::make_unique<TestPreviewsOptimizationGuide>(
&optimization_guide_service_,
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::CreateSequencedTaskRunner({base::ThreadPool(),
base::MayBlock(),
base::TaskPriority::BEST_EFFORT}),
@@ -451,7 +451,7 @@
void InitializeUIService() {
InitializeUIServiceWithoutWaitingForBlackList();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
@@ -480,7 +480,7 @@
base::SimpleTestClock clock_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FieldTrialList field_trial_list_;
TestPreviewsDeciderImpl* previews_decider_impl_;
optimization_guide::OptimizationGuideService optimization_guide_service_;
diff --git a/components/previews/content/previews_hints_unittest.cc b/components/previews/content/previews_hints_unittest.cc
index a41c91cd..3b239b8 100644
--- a/components/previews/content/previews_hints_unittest.cc
+++ b/components/previews/content/previews_hints_unittest.cc
@@ -89,7 +89,7 @@
hint_cache_ = std::make_unique<optimization_guide::HintCache>(
std::make_unique<optimization_guide::HintCacheStore>(
db_provider_.get(), temp_dir_.GetPath(), nullptr /* pref_service */,
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
is_store_initialized_ = false;
hint_cache_->Initialize(
@@ -147,7 +147,7 @@
void MaybeLoadHintAndLogHintCacheMatch(const GURL& url, bool is_committed);
void RunUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
@@ -169,7 +169,7 @@
void MaybeLoadHint(const GURL& url);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool is_store_initialized_;
bool are_previews_hints_initialized_;
diff --git a/components/previews/content/previews_optimization_guide_unittest.cc b/components/previews/content/previews_optimization_guide_unittest.cc
index 3c2b106..8c74784 100644
--- a/components/previews/content/previews_optimization_guide_unittest.cc
+++ b/components/previews/content/previews_optimization_guide_unittest.cc
@@ -201,9 +201,8 @@
: public optimization_guide::ProtoDatabaseProviderTestBase {
public:
PreviewsOptimizationGuideTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
~PreviewsOptimizationGuideTest() override {}
@@ -281,7 +280,7 @@
}
optimization_guide_service_ =
std::make_unique<TestOptimizationGuideService>(
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
pref_service_ = std::make_unique<TestingPrefServiceSimple>();
// Registry pref for DataSaver with default off.
@@ -291,12 +290,12 @@
guide_ = std::make_unique<TestPreviewsOptimizationGuide>(
optimization_guide_service_.get(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(), temp_dir(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(), temp_dir(),
pref_service_.get(), db_provider_.get(),
optimization_guide_top_host_provider_.get(), url_loader_factory_);
- guide_->SetTimeClockForTesting(scoped_task_environment_.GetMockClock());
+ guide_->SetTimeClockForTesting(task_environment_.GetMockClock());
base::test::ScopedFeatureList scoped_list;
scoped_list.InitAndEnableFeature(
@@ -310,7 +309,7 @@
}
const base::Clock* GetMockClock() const {
- return scoped_task_environment_.GetMockClock();
+ return task_environment_.GetMockClock();
}
void ResetGuide() {
@@ -329,15 +328,15 @@
base::FilePath temp_dir() const { return temp_dir_.GetPath(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
void MoveClockForwardBy(base::TimeDelta time_delta) {
- scoped_task_environment_.FastForwardBy(time_delta);
+ task_environment_.FastForwardBy(time_delta);
base::RunLoop().RunUntilIdle();
}
void RunUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
diff --git a/components/previews/content/previews_ui_service_unittest.cc b/components/previews/content/previews_ui_service_unittest.cc
index eede77b..875c9d5 100644
--- a/components/previews/content/previews_ui_service_unittest.cc
+++ b/components/previews/content/previews_ui_service_unittest.cc
@@ -214,7 +214,7 @@
protected:
// Run this test on a single thread.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestPreviewsLogger* logger_ptr_;
network::TestNetworkQualityTracker test_network_quality_tracker_;
diff --git a/components/previews/core/previews_black_list_unittest.cc b/components/previews/core/previews_black_list_unittest.cc
index 5db93c2a..d5cd2490 100644
--- a/components/previews/core/previews_black_list_unittest.cc
+++ b/components/previews/core/previews_black_list_unittest.cc
@@ -152,7 +152,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Observer to |black_list_|.
TestOptOutBlacklistDelegate blacklist_delegate_;
diff --git a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
index 735464d8..b0ba9da 100644
--- a/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
+++ b/components/proxy_config/pref_proxy_config_tracker_impl_unittest.cc
@@ -104,7 +104,7 @@
proxy_config_service_.reset();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestingPrefServiceSimple> pref_service_;
TestProxyConfigService* delegate_service_; // weak
std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
diff --git a/components/rappor/log_uploader_unittest.cc b/components/rappor/log_uploader_unittest.cc
index f8a5375..1fdc1db 100644
--- a/components/rappor/log_uploader_unittest.cc
+++ b/components/rappor/log_uploader_unittest.cc
@@ -65,12 +65,11 @@
class LogUploaderTest : public testing::Test {
public:
LogUploaderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
protected:
// Required for base::ThreadTaskRunnerHandle::Get().
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
private:
diff --git a/components/reading_list/core/reading_list_store_unittest.cc b/components/reading_list/core/reading_list_store_unittest.cc
index 9dfcbc5..b26acd3 100644
--- a/components/reading_list/core/reading_list_store_unittest.cc
+++ b/components/reading_list/core/reading_list_store_unittest.cc
@@ -143,7 +143,7 @@
}
// In memory model type store needs to be able to post tasks.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<syncer::MockModelTypeChangeProcessor> processor_;
std::unique_ptr<syncer::ModelTypeStore> store_;
diff --git a/components/rlz/rlz_tracker_unittest.cc b/components/rlz/rlz_tracker_unittest.cc
index f8c99f6..fd4865c 100644
--- a/components/rlz/rlz_tracker_unittest.cc
+++ b/components/rlz/rlz_tracker_unittest.cc
@@ -260,7 +260,7 @@
void ExpectRlzPingSent(bool expected);
void ExpectReactivationRlzPingSent(bool expected);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestRLZTrackerDelegate* delegate_;
std::unique_ptr<TestRLZTracker> tracker_;
RlzLibTestNoMachineStateHelper m_rlz_test_helper_;
diff --git a/components/safe_browsing/db/allowlist_checker_client_unittest.cc b/components/safe_browsing/db/allowlist_checker_client_unittest.cc
index 37e27371..2729824d9 100644
--- a/components/safe_browsing/db/allowlist_checker_client_unittest.cc
+++ b/components/safe_browsing/db/allowlist_checker_client_unittest.cc
@@ -50,8 +50,7 @@
class AllowlistCheckerClientTest : public testing::Test {
public:
AllowlistCheckerClientTest()
- : thread_bundle_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : thread_bundle_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
target_url_("https://example.test") {}
void SetUp() override {
diff --git a/components/safe_browsing/renderer/websocket_sb_handshake_throttle_unittest.cc b/components/safe_browsing/renderer/websocket_sb_handshake_throttle_unittest.cc
index 00d5952..56ee3b4 100644
--- a/components/safe_browsing/renderer/websocket_sb_handshake_throttle_unittest.cc
+++ b/components/safe_browsing/renderer/websocket_sb_handshake_throttle_unittest.cc
@@ -109,7 +109,7 @@
safe_browsing_ptr_.get(), MSG_ROUTING_NONE);
}
- base::test::ScopedTaskEnvironment message_loop_;
+ base::test::TaskEnvironment message_loop_;
FakeSafeBrowsing safe_browsing_;
mojo::Binding<mojom::SafeBrowsing> mojo_binding_;
mojom::SafeBrowsingPtr safe_browsing_ptr_;
diff --git a/components/safe_search_api/safe_search/safe_search_url_checker_client_unittest.cc b/components/safe_search_api/safe_search/safe_search_url_checker_client_unittest.cc
index d42e3f0..f7344a6 100644
--- a/components/safe_search_api/safe_search/safe_search_url_checker_client_unittest.cc
+++ b/components/safe_search_api/safe_search/safe_search_url_checker_client_unittest.cc
@@ -109,7 +109,7 @@
}
size_t next_url_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
std::unique_ptr<SafeSearchURLCheckerClient> checker_;
diff --git a/components/search_provider_logos/logo_service_impl_unittest.cc b/components/search_provider_logos/logo_service_impl_unittest.cc
index 9e797f3..5072e2e 100644
--- a/components/search_provider_logos/logo_service_impl_unittest.cc
+++ b/components/search_provider_logos/logo_service_impl_unittest.cc
@@ -418,7 +418,7 @@
bool use_gray_background() const { return use_gray_background_; }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TemplateURLService template_url_service_;
base::SimpleTestClock test_clock_;
NiceMock<MockLogoCache>* logo_cache_;
diff --git a/components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc b/components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc
index 3f3ffee..421e1e2 100644
--- a/components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc
+++ b/components/send_tab_to_self/send_tab_to_self_bridge_unittest.cc
@@ -195,7 +195,7 @@
base::SimpleTestClock clock_;
// In memory model type store needs to be able to post tasks.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<syncer::ModelTypeStore> store_;
diff --git a/components/services/filesystem/directory_impl_unittest.cc b/components/services/filesystem/directory_impl_unittest.cc
index 0b8d9ad..73b463ec 100644
--- a/components/services/filesystem/directory_impl_unittest.cc
+++ b/components/services/filesystem/directory_impl_unittest.cc
@@ -29,7 +29,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DirectoryTestHelper test_helper_;
DISALLOW_COPY_AND_ASSIGN(DirectoryImplTest);
diff --git a/components/services/filesystem/file_impl_unittest.cc b/components/services/filesystem/file_impl_unittest.cc
index 7a3e90c..32a93845 100644
--- a/components/services/filesystem/file_impl_unittest.cc
+++ b/components/services/filesystem/file_impl_unittest.cc
@@ -27,7 +27,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DirectoryTestHelper test_helper_;
DISALLOW_COPY_AND_ASSIGN(FileImplTest);
diff --git a/components/services/font/font_loader_unittest.cc b/components/services/font/font_loader_unittest.cc
index 1deaa3e..cf7f1c5 100644
--- a/components/services/font/font_loader_unittest.cc
+++ b/components/services/font/font_loader_unittest.cc
@@ -78,7 +78,7 @@
FontLoader* font_loader() { return &font_loader_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
FontLoader font_loader_{ConnectToBackgroundFontService()};
DISALLOW_COPY_AND_ASSIGN(FontLoaderTest);
diff --git a/components/services/leveldb/leveldb_service_unittest.cc b/components/services/leveldb/leveldb_service_unittest.cc
index 3450430c..ad97bef8 100644
--- a/components/services/leveldb/leveldb_service_unittest.cc
+++ b/components/services/leveldb/leveldb_service_unittest.cc
@@ -183,7 +183,7 @@
mojo::Remote<mojom::LevelDBService>& leveldb() { return leveldb_remote_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::test::ScopedFeatureList feature_list_;
filesystem::DirectoryTestHelper directory_helper_;
LevelDBServiceImpl leveldb_service_;
diff --git a/components/services/leveldb/remote_iterator_unittest.cc b/components/services/leveldb/remote_iterator_unittest.cc
index c7f7e1f2..1071596 100644
--- a/components/services/leveldb/remote_iterator_unittest.cc
+++ b/components/services/leveldb/remote_iterator_unittest.cc
@@ -81,7 +81,7 @@
mojom::LevelDBDatabaseAssociatedPtr& database() { return database_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
LevelDBServiceImpl leveldb_service_;
mojo::Remote<mojom::LevelDBService> leveldb_remote_;
mojo::Receiver<mojom::LevelDBService> leveldb_receiver_;
diff --git a/components/services/pdf_compositor/pdf_compositor_impl_unittest.cc b/components/services/pdf_compositor/pdf_compositor_impl_unittest.cc
index 9cfad06..72179d2a 100644
--- a/components/services/pdf_compositor/pdf_compositor_impl_unittest.cc
+++ b/components/services/pdf_compositor/pdf_compositor_impl_unittest.cc
@@ -44,8 +44,7 @@
class PdfCompositorImplTest : public testing::Test {
public:
PdfCompositorImplTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
run_loop_(std::make_unique<base::RunLoop>()),
is_ready_(false) {}
@@ -77,7 +76,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
bool is_ready_;
};
diff --git a/components/services/quarantine/quarantine_service_unittest.cc b/components/services/quarantine/quarantine_service_unittest.cc
index 469bd7e..bfe76daa 100644
--- a/components/services/quarantine/quarantine_service_unittest.cc
+++ b/components/services/quarantine/quarantine_service_unittest.cc
@@ -38,7 +38,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Remote<mojom::Quarantine> quarantine_;
mojom::QuarantineFileResult result_;
diff --git a/components/services/unzip/public/cpp/unzip_unittest.cc b/components/services/unzip/public/cpp/unzip_unittest.cc
index 8880bcd..17c07bb 100644
--- a/components/services/unzip/public/cpp/unzip_unittest.cc
+++ b/components/services/unzip/public/cpp/unzip_unittest.cc
@@ -104,7 +104,7 @@
unzip_dir_ = temp_dir_.GetPath();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
base::FilePath unzip_dir_;
diff --git a/components/signin/core/browser/account_investigator_unittest.cc b/components/signin/core/browser/account_investigator_unittest.cc
index ebcd10f..796e5b7 100644
--- a/components/signin/core/browser/account_investigator_unittest.cc
+++ b/components/signin/core/browser/account_investigator_unittest.cc
@@ -133,7 +133,7 @@
private:
// Timer needs a message loop.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_test_env_;
diff --git a/components/signin/core/browser/account_reconcilor_unittest.cc b/components/signin/core/browser/account_reconcilor_unittest.cc
index b046244..ac1a655 100644
--- a/components/signin/core/browser/account_reconcilor_unittest.cc
+++ b/components/signin/core/browser/account_reconcilor_unittest.cc
@@ -236,9 +236,7 @@
return &identity_test_env_;
}
- base::test::ScopedTaskEnvironment* task_environment() {
- return &task_environment_;
- }
+ base::test::TaskEnvironment* task_environment() { return &task_environment_; }
TestSigninClient* test_signin_client() { return &test_signin_client_; }
base::HistogramTester* histogram_tester() { return &histogram_tester_; }
@@ -276,7 +274,7 @@
network::TestURLLoaderFactory test_url_loader_factory_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
signin::AccountConsistencyMethod account_consistency_;
bool dice_migration_completed_ = false;
sync_preferences::TestingPrefServiceSyncable pref_service_;
@@ -341,8 +339,7 @@
signin::AccountConsistencyMethod::kMirror));
AccountReconcilorTest::AccountReconcilorTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
account_consistency_(signin::AccountConsistencyMethod::kDisabled),
test_signin_client_(&pref_service_, &test_url_loader_factory_),
identity_test_env_(/*test_url_loader_factory=*/nullptr,
diff --git a/components/signin/core/browser/consistency_cookie_manager_unittest.cc b/components/signin/core/browser/consistency_cookie_manager_unittest.cc
index 5023f2c..9ad9444 100644
--- a/components/signin/core/browser/consistency_cookie_manager_unittest.cc
+++ b/components/signin/core/browser/consistency_cookie_manager_unittest.cc
@@ -100,7 +100,7 @@
private:
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
// Owned by signin_client_.
diff --git a/components/signin/core/browser/signin_error_controller_unittest.cc b/components/signin/core/browser/signin_error_controller_unittest.cc
index bcb736d..2673173d 100644
--- a/components/signin/core/browser/signin_error_controller_unittest.cc
+++ b/components/signin/core/browser/signin_error_controller_unittest.cc
@@ -35,7 +35,7 @@
MockSigninErrorControllerObserver observer;
EXPECT_CALL(observer, OnErrorChanged()).Times(0);
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
SigninErrorController error_controller(
SigninErrorController::AccountMode::ANY_ACCOUNT,
@@ -83,7 +83,7 @@
}
TEST(SigninErrorControllerTest, AccountTransitionAnyAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
CoreAccountId test_account_id =
@@ -114,7 +114,7 @@
// ChromeOS.
#if !defined(OS_CHROMEOS)
TEST(SigninErrorControllerTest, AccountTransitionPrimaryAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
signin::PrimaryAccountMutator* primary_account_mutator =
identity_test_env.identity_manager()->GetPrimaryAccountMutator();
@@ -179,7 +179,7 @@
// Verify that SigninErrorController handles errors properly.
TEST(SigninErrorControllerTest, AuthStatusEnumerateAllErrors) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
CoreAccountId test_account_id =
@@ -226,7 +226,7 @@
// Verify that existing error is not replaced by new error.
TEST(SigninErrorControllerTest, AuthStatusChange) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
CoreAccountId test_account_id =
@@ -282,7 +282,7 @@
TEST(SigninErrorControllerTest,
PrimaryAccountErrorsArePreferredToSecondaryAccountErrors) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
AccountInfo primary_account_info =
@@ -329,7 +329,7 @@
}
TEST(SigninErrorControllerTest, PrimaryAccountErrorsAreSticky) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment identity_test_env;
AccountInfo primary_account_info =
diff --git a/components/signin/core/browser/signin_header_helper_unittest.cc b/components/signin/core/browser/signin_header_helper_unittest.cc
index c36fd26..0d5476e 100644
--- a/components/signin/core/browser/signin_header_helper_unittest.cc
+++ b/components/signin/core/browser/signin_header_helper_unittest.cc
@@ -112,7 +112,7 @@
}
#endif
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool sync_enabled_ = false;
std::string device_id_ = kTestDeviceId;
diff --git a/components/signin/core/browser/signin_investigator_unittest.cc b/components/signin/core/browser/signin_investigator_unittest.cc
index 31df9131..2548070 100644
--- a/components/signin/core/browser/signin_investigator_unittest.cc
+++ b/components/signin/core/browser/signin_investigator_unittest.cc
@@ -33,7 +33,7 @@
PrefService* GetPrefs() override { return &prefs_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
signin::IdentityTestEnvironment identity_test_env_;
};
diff --git a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
index e4f0d258..99d30f4a 100644
--- a/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
+++ b/components/signin/internal/identity_manager/account_tracker_service_unittest.cc
@@ -319,7 +319,7 @@
void ReturnFetchResults(net::HttpStatusCode response_code,
const std::string& response_string);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
void CreateAccountTracker(base::FilePath path, bool network_enabled) {
@@ -407,7 +407,7 @@
AccountKey account_key) {
GetTestURLLoaderFactory()->AddResponse(
AccountKeyToPictureURLWithSize(account_key), "image data");
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void AccountTrackerServiceTest::ReturnAccountImageFetchFailure(
@@ -415,7 +415,7 @@
GetTestURLLoaderFactory()->AddResponse(
AccountKeyToPictureURLWithSize(account_key), std::string(),
net::HTTP_BAD_REQUEST);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(AccountTrackerServiceTest, Basic) {}
@@ -682,7 +682,7 @@
AccountKeyToEmail(kAccountKeyBeta)),
}));
// Wait until all account images are loaded.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(CheckAccountTrackerEvents({
TrackingEvent(UPDATED, AccountKeyToAccountId(kAccountKeyAlpha),
AccountKeyToGaiaId(kAccountKeyAlpha),
diff --git a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
index 410107a2..0df78ae 100644
--- a/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
+++ b/components/signin/internal/identity_manager/gaia_cookie_manager_service_unittest.cc
@@ -228,7 +228,7 @@
const CoreAccountId account_id3_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
GoogleServiceAuthError no_error_;
GoogleServiceAuthError error_;
GoogleServiceAuthError canceled_;
diff --git a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
index 3c3b4e04..12f55b8 100644
--- a/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
+++ b/components/signin/internal/identity_manager/mutable_profile_oauth2_token_service_delegate_unittest.cc
@@ -84,9 +84,9 @@
public WebDataServiceConsumer {
public:
MutableProfileOAuth2TokenServiceDelegateTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC),
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC),
access_token_success_count_(0),
access_token_failure_count_(0),
access_token_failure_(GoogleServiceAuthError::NONE),
@@ -248,7 +248,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestSigninClient> client_;
std::unique_ptr<MutableProfileOAuth2TokenServiceDelegate>
oauth2_service_delegate_;
diff --git a/components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc b/components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc
index 9ad5f88..3e22e071 100644
--- a/components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc
+++ b/components/signin/internal/identity_manager/oauth_multilogin_helper_unittest.cc
@@ -217,7 +217,7 @@
result_ = result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool callback_called_ = false;
SetAccountsInCookieResult result_;
diff --git a/components/signin/internal/identity_manager/oauth_multilogin_token_fetcher_unittest.cc b/components/signin/internal/identity_manager/oauth_multilogin_token_fetcher_unittest.cc
index ebeb12b..fe9cbf0 100644
--- a/components/signin/internal/identity_manager/oauth_multilogin_token_fetcher_unittest.cc
+++ b/components/signin/internal/identity_manager/oauth_multilogin_token_fetcher_unittest.cc
@@ -73,7 +73,7 @@
error_ = error;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool success_callback_called_ = false;
bool failure_callback_called_ = false;
diff --git a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
index 8549cd8..97ce38b9 100644
--- a/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager_unittest.cc
@@ -130,7 +130,7 @@
void GoogleSignedOut(const AccountInfo& account_info) { num_signouts_++; }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable user_prefs_;
TestingPrefServiceSimple local_state_;
TestSigninClient test_signin_client_;
diff --git a/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc b/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
index 282eab2e..92ad0b6 100644
--- a/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
+++ b/components/signin/internal/identity_manager/primary_account_policy_manager_impl_unittest.cc
@@ -43,7 +43,7 @@
test_signin_client_.Shutdown();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable user_prefs_;
TestingPrefServiceSimple local_state_;
TestSigninClient test_signin_client_;
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
index fe4be52..aeb13ba 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_chromeos_unittest.cc
@@ -207,7 +207,7 @@
GetValidTokenResponse("token", 3600));
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir tmp_dir_;
AccountInfo account_info_;
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_ios_unittest.mm b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_ios_unittest.mm
index 0092a3f8..0111d81 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_ios_unittest.mm
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_ios_unittest.mm
@@ -105,7 +105,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::FakeURLFetcherFactory factory_;
TestingPrefServiceSimple prefs_;
TestSigninClient client_;
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_unittest.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service_unittest.cc
index ff8055e..cfea25e 100644
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_unittest.cc
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_unittest.cc
@@ -116,9 +116,9 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::
- IO}; // net:: stuff needs IO message loop.
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO}; // net:: stuff needs IO
+ // message loop.
network::TestURLLoaderFactory* test_url_loader_factory_ = nullptr;
FakeProfileOAuth2TokenServiceDelegate* delegate_ptr_ = nullptr; // Not owned.
std::unique_ptr<ProfileOAuth2TokenService> oauth2_service_;
diff --git a/components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc b/components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc
index f4e7d91..b0b0797 100644
--- a/components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc
+++ b/components/signin/internal/identity_manager/ubertoken_fetcher_impl_unittest.cc
@@ -51,8 +51,7 @@
class UbertokenFetcherImplTest : public testing::Test {
public:
UbertokenFetcherImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
token_service_(&pref_service_),
test_shared_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
@@ -65,7 +64,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple pref_service_;
FakeProfileOAuth2TokenService token_service_;
network::TestURLLoaderFactory url_loader_factory_;
diff --git a/components/signin/ios/browser/wait_for_network_callback_helper_unittest.cc b/components/signin/ios/browser/wait_for_network_callback_helper_unittest.cc
index 7fb8e7cc..b0e7b60 100644
--- a/components/signin/ios/browser/wait_for_network_callback_helper_unittest.cc
+++ b/components/signin/ios/browser/wait_for_network_callback_helper_unittest.cc
@@ -21,7 +21,7 @@
WaitForNetworkCallbackHelperTest() : num_callbacks_invoked_(0) {}
int num_callbacks_invoked_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::test::MockNetworkChangeNotifier>
network_change_notifier_ = net::test::MockNetworkChangeNotifier::Create();
WaitForNetworkCallbackHelper callback_helper_;
@@ -51,6 +51,6 @@
net::NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI);
network_change_notifier_->NotifyObserversOfConnectionTypeChangeForTests(
net::NetworkChangeNotifier::ConnectionType::CONNECTION_WIFI);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(2, num_callbacks_invoked_);
}
diff --git a/components/signin/public/identity_manager/access_token_fetcher_unittest.cc b/components/signin/public/identity_manager/access_token_fetcher_unittest.cc
index 2de2b66..ef29317 100644
--- a/components/signin/public/identity_manager/access_token_fetcher_unittest.cc
+++ b/components/signin/public/identity_manager/access_token_fetcher_unittest.cc
@@ -117,7 +117,7 @@
std::move(on_access_token_request_callback_).Run();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSyncable pref_service_;
TestSigninClient signin_client_;
FakeProfileOAuth2TokenService token_service_;
diff --git a/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc b/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc
index add100d3..fda8017b 100644
--- a/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc
+++ b/components/signin/public/identity_manager/accounts_cookie_mutator_unittest.cc
@@ -137,7 +137,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
TestSigninClient test_signin_client_;
IdentityTestEnvironment identity_test_env_;
diff --git a/components/signin/public/identity_manager/accounts_mutator_unittest.cc b/components/signin/public/identity_manager/accounts_mutator_unittest.cc
index 8db42ec0..d06ea9a8 100644
--- a/components/signin/public/identity_manager/accounts_mutator_unittest.cc
+++ b/components/signin/public/identity_manager/accounts_mutator_unittest.cc
@@ -110,7 +110,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable prefs_;
network::TestURLLoaderFactory test_url_loader_factory_;
IdentityTestEnvironment identity_test_env_;
diff --git a/components/signin/public/identity_manager/diagnostics_provider_unittest.cc b/components/signin/public/identity_manager/diagnostics_provider_unittest.cc
index 87fb50f..b9be3e54 100644
--- a/components/signin/public/identity_manager/diagnostics_provider_unittest.cc
+++ b/components/signin/public/identity_manager/diagnostics_provider_unittest.cc
@@ -29,7 +29,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
signin::IdentityTestEnvironment identity_test_env_;
diff --git a/components/signin/public/identity_manager/identity_manager_unittest.cc b/components/signin/public/identity_manager/identity_manager_unittest.cc
index 844efef..86a95ce 100644
--- a/components/signin/public/identity_manager/identity_manager_unittest.cc
+++ b/components/signin/public/identity_manager/identity_manager_unittest.cc
@@ -403,7 +403,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
network::TestURLLoaderFactory test_url_loader_factory_;
TestSigninClient signin_client_;
diff --git a/components/signin/public/identity_manager/identity_test_environment.cc b/components/signin/public/identity_manager/identity_test_environment.cc
index 08026c7a..6906841 100644
--- a/components/signin/public/identity_manager/identity_test_environment.cc
+++ b/components/signin/public/identity_manager/identity_test_environment.cc
@@ -127,7 +127,7 @@
"environment. "
"If your test has an existing one, move it to be initialized before "
"IdentityTestEnvironment. Otherwise, use "
- "base::test::ScopedTaskEnvironment.";
+ "base::test::TaskEnvironment.";
test_identity_manager_observer_ =
std::make_unique<TestIdentityManagerObserver>(this->identity_manager());
this->identity_manager()->AddDiagnosticsObserver(this);
diff --git a/components/signin/public/identity_manager/identity_test_environment.h b/components/signin/public/identity_manager/identity_test_environment.h
index 76aeeff..ab6184e 100644
--- a/components/signin/public/identity_manager/identity_test_environment.h
+++ b/components/signin/public/identity_manager/identity_test_environment.h
@@ -39,7 +39,7 @@
// not available; call MakePrimaryAccountAvailable() as needed.
// NOTE: IdentityTestEnvironment requires that tests have a properly set up
// task environment. If your test doesn't already have one, use a
-// base::test::ScopedTaskEnvironment instance variable to fulfill this
+// base::test::TaskEnvironment instance variable to fulfill this
// requirement.
class IdentityTestEnvironment : public IdentityManager::DiagnosticsObserver {
public:
diff --git a/components/signin/public/identity_manager/identity_test_environment_unittest.cc b/components/signin/public/identity_manager/identity_test_environment_unittest.cc
index 9c03209a..cf310db 100644
--- a/components/signin/public/identity_manager/identity_test_environment_unittest.cc
+++ b/components/signin/public/identity_manager/identity_test_environment_unittest.cc
@@ -14,17 +14,14 @@
class IdentityTestEnvironmentTest : public testing::Test {
public:
IdentityTestEnvironmentTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
- ~IdentityTestEnvironmentTest() override {
- scoped_task_environment_.RunUntilIdle();
- }
+ ~IdentityTestEnvironmentTest() override { task_environment_.RunUntilIdle(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(IdentityTestEnvironmentTest);
};
diff --git a/components/signin/public/identity_manager/primary_account_access_token_fetcher_unittest.cc b/components/signin/public/identity_manager/primary_account_access_token_fetcher_unittest.cc
index b0136c69c..a6f62f6b1 100644
--- a/components/signin/public/identity_manager/primary_account_access_token_fetcher_unittest.cc
+++ b/components/signin/public/identity_manager/primary_account_access_token_fetcher_unittest.cc
@@ -77,7 +77,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
IdentityTestEnvironment identity_test_env_;
AccessTokenInfo access_token_info_;
};
diff --git a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
index a18d03c2..e85615c 100644
--- a/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
+++ b/components/signin/public/identity_manager/primary_account_mutator_unittest.cc
@@ -100,7 +100,7 @@
signin::PrimaryAccountMutator::ClearAccountsAction account_action,
RemoveAccountExpectation account_expectation,
AuthExpectation auth_expection = AuthExpectation::kAuthNormal) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment(
/*test_url_loader_factory=*/nullptr, /*pref_service=*/nullptr,
account_consistency_method);
@@ -215,7 +215,7 @@
// Checks that setting the primary account works.
TEST_F(PrimaryAccountMutatorTest, SetPrimaryAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
@@ -247,7 +247,7 @@
// Checks that setting the primary account fails if the account is not known by
// the identity service.
TEST_F(PrimaryAccountMutatorTest, SetPrimaryAccount_NoAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
@@ -265,7 +265,7 @@
// Checks that setting the primary account fails if the account is unknown.
TEST_F(PrimaryAccountMutatorTest, SetPrimaryAccount_UnknownAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
@@ -287,7 +287,7 @@
// Checks that trying to set the primary account fails when there is already a
// primary account.
TEST_F(PrimaryAccountMutatorTest, SetPrimaryAccount_AlreadyHasPrimaryAccount) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
@@ -320,7 +320,7 @@
// account is not allowed.
TEST_F(PrimaryAccountMutatorTest,
SetPrimaryAccount_SettingPrimaryAccountForbidden) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
sync_preferences::TestingPrefServiceSyncable pref_service;
signin::IdentityTestEnvironment environment(
@@ -354,7 +354,7 @@
// support clearing the primary account.
#if !defined(OS_CHROMEOS)
TEST_F(PrimaryAccountMutatorTest, ClearPrimaryAccount_NotSignedIn) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
@@ -385,7 +385,7 @@
}
TEST_F(PrimaryAccountMutatorTest, ClearPrimaryAccount_Default) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
signin::IdentityTestEnvironment environment;
signin::IdentityManager* identity_manager = environment.identity_manager();
diff --git a/components/spellcheck/browser/spellcheck_host_metrics_unittest.cc b/components/spellcheck/browser/spellcheck_host_metrics_unittest.cc
index 9d030076..4779ec69 100644
--- a/components/spellcheck/browser/spellcheck_host_metrics_unittest.cc
+++ b/components/spellcheck/browser/spellcheck_host_metrics_unittest.cc
@@ -27,7 +27,7 @@
void RecordWordCountsForTesting() { metrics_->RecordWordCounts(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<SpellCheckHostMetrics> metrics_;
};
diff --git a/components/spellcheck/browser/spellcheck_platform_mac_unittest.cc b/components/spellcheck/browser/spellcheck_platform_mac_unittest.cc
index 155c206..8c403bf 100644
--- a/components/spellcheck/browser/spellcheck_platform_mac_unittest.cc
+++ b/components/spellcheck/browser/spellcheck_platform_mac_unittest.cc
@@ -49,8 +49,8 @@
base::Unretained(this)));
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
spellcheck_platform::ScopedEnglishLanguageForTest scoped_language_;
};
diff --git a/components/spellcheck/browser/spellcheck_platform_win_unittest.cc b/components/spellcheck/browser/spellcheck_platform_win_unittest.cc
index cd71ff6..ef543a2 100644
--- a/components/spellcheck/browser/spellcheck_platform_win_unittest.cc
+++ b/components/spellcheck/browser/spellcheck_platform_win_unittest.cc
@@ -57,8 +57,8 @@
std::vector<SpellCheckResult> spell_check_results_;
base::OnceClosure quit_;
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
};
TEST_F(SpellcheckPlatformWinTest, SpellCheckSuggestions_EN_US) {
diff --git a/components/spellcheck/renderer/empty_local_interface_provider.h b/components/spellcheck/renderer/empty_local_interface_provider.h
index 9fe12c4d..d861c9f 100644
--- a/components/spellcheck/renderer/empty_local_interface_provider.h
+++ b/components/spellcheck/renderer/empty_local_interface_provider.h
@@ -10,7 +10,7 @@
namespace spellcheck {
// A dummy LocalInterfaceProvider that doesn't bind any remote application.
-// May require a base::test::ScopedTaskEnvironment if GetInterface() is expected
+// May require a base::test::TaskEnvironment if GetInterface() is expected
// to be called.
class EmptyLocalInterfaceProvider
: public service_manager::LocalInterfaceProvider {
diff --git a/components/spellcheck/renderer/spellcheck_multilingual_unittest.cc b/components/spellcheck/renderer/spellcheck_multilingual_unittest.cc
index 62bbdac..b89fc1a 100644
--- a/components/spellcheck/renderer/spellcheck_multilingual_unittest.cc
+++ b/components/spellcheck/renderer/spellcheck_multilingual_unittest.cc
@@ -114,7 +114,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
spellcheck::EmptyLocalInterfaceProvider embedder_provider_;
// Owned by |provider_|.
diff --git a/components/spellcheck/renderer/spellcheck_unittest.cc b/components/spellcheck/renderer/spellcheck_unittest.cc
index 8e0a05a..259487a 100644
--- a/components/spellcheck/renderer/spellcheck_unittest.cc
+++ b/components/spellcheck/renderer/spellcheck_unittest.cc
@@ -130,7 +130,7 @@
private:
spellcheck::EmptyLocalInterfaceProvider embedder_provider_;
std::unique_ptr<SpellCheck> spell_check_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
struct MockTextCheckingResult {
diff --git a/components/ssl_errors/error_classification_unittest.cc b/components/ssl_errors/error_classification_unittest.cc
index 6161d19..8072724 100644
--- a/components/ssl_errors/error_classification_unittest.cc
+++ b/components/ssl_errors/error_classification_unittest.cc
@@ -363,8 +363,8 @@
// Tests that all possible NetworkClockState histogram values are recorded
// appropriately.
TEST_F(SSLErrorClassificationTest, NetworkClockStateHistogram) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
scoped_refptr<network::TestSharedURLLoaderFactory> shared_url_loader_factory =
base::MakeRefCounted<network::TestSharedURLLoaderFactory>();
diff --git a/components/storage_monitor/storage_monitor_linux_unittest.cc b/components/storage_monitor/storage_monitor_linux_unittest.cc
index 2b475bf..d2f3dee 100644
--- a/components/storage_monitor/storage_monitor_linux_unittest.cc
+++ b/components/storage_monitor/storage_monitor_linux_unittest.cc
@@ -188,13 +188,13 @@
monitor_->AddObserver(mock_storage_observer_.get());
monitor_->Init();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void TearDown() override {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
monitor_->RemoveObserver(mock_storage_observer_.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Linux storage monitor must be destroyed on the UI thread, so do it here.
monitor_.reset();
@@ -309,7 +309,7 @@
ASSERT_EQ(1, endmntent(file));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockRemovableStorageObserver> mock_storage_observer_;
diff --git a/components/storage_monitor/storage_monitor_unittest.cc b/components/storage_monitor/storage_monitor_unittest.cc
index 3bf96fb..b4a8ab3 100644
--- a/components/storage_monitor/storage_monitor_unittest.cc
+++ b/components/storage_monitor/storage_monitor_unittest.cc
@@ -24,7 +24,7 @@
namespace storage_monitor {
TEST(StorageMonitorTest, TestInitialize) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestStorageMonitor::Destroy();
TestStorageMonitor monitor;
EXPECT_FALSE(monitor.init_called());
@@ -39,7 +39,7 @@
TEST(StorageMonitorTest, DeviceAttachDetachNotifications) {
TestStorageMonitor::Destroy();
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
const std::string kDeviceId1 = "dcim:UUID:FFF0-0001";
const std::string kDeviceId2 = "dcim:UUID:FFF0-0002";
MockRemovableStorageObserver observer1;
@@ -82,7 +82,7 @@
TEST(StorageMonitorTest, GetAllAvailableStoragesEmpty) {
TestStorageMonitor::Destroy();
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestStorageMonitor monitor;
std::vector<StorageInfo> devices = monitor.GetAllAvailableStorages();
EXPECT_EQ(0U, devices.size());
@@ -90,7 +90,7 @@
TEST(StorageMonitorTest, GetAllAvailableStorageAttachDetach) {
TestStorageMonitor::Destroy();
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestStorageMonitor monitor;
const std::string kDeviceId1 = "dcim:UUID:FFF0-0042";
const base::FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));
diff --git a/components/subresource_filter/content/browser/async_document_subresource_filter_unittest.cc b/components/subresource_filter/content/browser/async_document_subresource_filter_unittest.cc
index 91d4fe7..6dbd3c21 100644
--- a/components/subresource_filter/content/browser/async_document_subresource_filter_unittest.cc
+++ b/components/subresource_filter/content/browser/async_document_subresource_filter_unittest.cc
@@ -77,7 +77,7 @@
// Note: ADSF assumes a task runner is associated with the current thread.
// Instantiate a MessageLoop on the current thread and use base::RunLoop to
// handle the replies ADSF tasks generate.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::TestSimpleTaskRunner> blocking_task_runner_ =
new base::TestSimpleTaskRunner;
diff --git a/components/subresource_filter/content/browser/ruleset_service_unittest.cc b/components/subresource_filter/content/browser/ruleset_service_unittest.cc
index 1d4a284..1be4fea5 100644
--- a/components/subresource_filter/content/browser/ruleset_service_unittest.cc
+++ b/components/subresource_filter/content/browser/ruleset_service_unittest.cc
@@ -359,7 +359,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir scoped_temp_dir_;
scoped_refptr<base::TestSimpleTaskRunner> blocking_task_runner_;
diff --git a/components/suggestions/suggestions_service_impl_unittest.cc b/components/suggestions/suggestions_service_impl_unittest.cc
index 459ee07..0a373ac 100644
--- a/components/suggestions/suggestions_service_impl_unittest.cc
+++ b/components/suggestions/suggestions_service_impl_unittest.cc
@@ -134,7 +134,7 @@
url_loader_factory()),
base::WrapUnique(test_suggestions_store_),
base::WrapUnique(mock_blacklist_store_),
- scoped_task_environment_.GetMockTickClock());
+ task_environment_.GetMockTickClock());
}
GURL GetCurrentlyQueriedUrl() {
@@ -171,7 +171,7 @@
bool rv = url_loader_factory()->SimulateResponseForPendingRequest(
url, network::URLLoaderCompletionStatus(net_error),
network::CreateResourceResponseHead(response_code), response_body);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return rv;
}
@@ -193,8 +193,8 @@
return &url_loader_factory_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
private:
signin::IdentityTestEnvironment identity_test_env_;
@@ -224,7 +224,7 @@
EXPECT_CALL(callback, Run(_));
// Wait for the eventual network request.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(GetCurrentlyQueriedUrl().is_valid());
EXPECT_EQ(GetCurrentlyQueriedUrl().path(), kSuggestionsUrlPath);
ASSERT_TRUE(RespondToFetchWithProfile(CreateSuggestionsProfile()));
@@ -247,7 +247,7 @@
->OnStateChanged(sync_service());
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
}
@@ -263,7 +263,7 @@
->OnStateChanged(sync_service());
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
SuggestionsProfile empty_suggestions;
@@ -283,7 +283,7 @@
->OnStateChanged(sync_service());
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
}
@@ -297,7 +297,7 @@
static_cast<SyncServiceObserver*>(suggestions_service())
->OnStateChanged(sync_service());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_FALSE(suggestions_service()->HasPendingRequestForTesting());
// Sync getting enabled should not result in a fetch.
@@ -307,7 +307,7 @@
->OnStateChanged(sync_service());
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
}
@@ -326,7 +326,7 @@
suggestions_service()->FetchSuggestionsData();
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
// |suggestions_store()| should still contain the default values.
@@ -355,7 +355,7 @@
suggestions_service()->FetchSuggestionsData();
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
}
@@ -376,7 +376,7 @@
GoogleServiceAuthError::State::INVALID_GAIA_CREDENTIALS));
// Wait for eventual (but unexpected) network requests.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(suggestions_service()->HasPendingRequestForTesting());
}
@@ -387,7 +387,7 @@
suggestions_service()->FetchSuggestionsData();
// Wait for the eventual network request.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToSuggestionsFetch("irrelevant", net::HTTP_OK,
net::ERR_INVALID_RESPONSE));
}
@@ -403,7 +403,7 @@
suggestions_service()->FetchSuggestionsData();
// Wait for the eventual network request.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToSuggestionsFetch("irrelevant", net::HTTP_BAD_REQUEST));
SuggestionsProfile empty_suggestions;
@@ -433,14 +433,14 @@
// Wait on the upload task, the blacklist request and the next blacklist
// scheduling task.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
EXPECT_EQ(GetCurrentlyQueriedUrl().path(), kBlacklistUrlPath);
// The blacklist fetch needs to contain a valid profile or the favicon will
// not be set.
ASSERT_TRUE(RespondToBlacklistFetch(
CreateSuggestionsProfile().SerializeAsString(), net::HTTP_OK));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
SuggestionsProfile suggestions;
suggestions_store()->LoadSuggestions(&suggestions);
@@ -483,7 +483,7 @@
EXPECT_TRUE(suggestions_service()->BlacklistURL(GURL(kBlacklistedUrl)));
// Wait for the first scheduling receiving a failing response.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_TRUE(GetCurrentlyQueriedUrl().is_valid());
EXPECT_EQ(GetCurrentlyQueriedUrl().path(), kBlacklistUrlPath);
ASSERT_TRUE(RespondToBlacklistFetch("irrelevant", net::HTTP_OK,
@@ -503,7 +503,7 @@
.WillOnce(Return(true));
// Wait for the second scheduling followed by a successful response.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_TRUE(suggestions_service()->HasPendingRequestForTesting());
ASSERT_TRUE(GetCurrentlyQueriedUrl().is_valid());
EXPECT_EQ(GetCurrentlyQueriedUrl().path(), kBlacklistUrlPath);
@@ -562,7 +562,7 @@
suggestions_service()->ClearBlacklist();
// Wait for the eventual network request.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(suggestions_service()->HasPendingRequestForTesting());
EXPECT_EQ(GetCurrentlyQueriedUrl().path(), kBlacklistClearUrlPath);
}
@@ -628,13 +628,13 @@
// Delay unchanged on success.
suggestions_service()->FetchSuggestionsData();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToFetchWithProfile(CreateSuggestionsProfile()));
EXPECT_EQ(initial_delay, suggestions_service()->BlacklistDelayForTesting());
// Delay increases on failure.
suggestions_service()->FetchSuggestionsData();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToSuggestionsFetch("irrelevant", net::HTTP_BAD_REQUEST));
base::TimeDelta delay_after_fail =
suggestions_service()->BlacklistDelayForTesting();
@@ -643,15 +643,15 @@
// Success resets future delays, but the current horizon remains. Since no
// time has passed, the actual current delay stays the same.
suggestions_service()->FetchSuggestionsData();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToFetchWithProfile(CreateSuggestionsProfile()));
EXPECT_EQ(delay_after_fail,
suggestions_service()->BlacklistDelayForTesting());
// After the current horizon has passed, we're back at the initial delay.
- scoped_task_environment_.FastForwardBy(delay_after_fail);
+ task_environment_.FastForwardBy(delay_after_fail);
suggestions_service()->FetchSuggestionsData();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(RespondToFetchWithProfile(CreateSuggestionsProfile()));
EXPECT_EQ(initial_delay, suggestions_service()->BlacklistDelayForTesting());
}
@@ -663,7 +663,7 @@
suggestions_service()->FetchSuggestionsData();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Creates one suggestion without timestamp and adds a second with timestamp.
SuggestionsProfile profile = CreateSuggestionsProfile();
ChromeSuggestion* suggestion = profile.add_suggestions();
diff --git a/components/sync/base/bind_to_task_runner_unittest.cc b/components/sync/base/bind_to_task_runner_unittest.cc
index 5151fd1..5e94c96 100644
--- a/components/sync/base/bind_to_task_runner_unittest.cc
+++ b/components/sync/base/bind_to_task_runner_unittest.cc
@@ -47,7 +47,7 @@
// on the message loop, not during the original Run.
class BindToTaskRunnerTest : public ::testing::Test {
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BindToTaskRunnerTest, Closure) {
diff --git a/components/sync/base/cancelation_signal_unittest.cc b/components/sync/base/cancelation_signal_unittest.cc
index 04d95694..6b87bdc 100644
--- a/components/sync/base/cancelation_signal_unittest.cc
+++ b/components/sync/base/cancelation_signal_unittest.cc
@@ -112,7 +112,7 @@
bool VerifyTaskNotStarted();
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
CancelationSignal signal_;
base::WaitableEvent task_start_event_;
diff --git a/components/sync/base/sync_prefs_unittest.cc b/components/sync/base/sync_prefs_unittest.cc
index e704bf9..c319d38 100644
--- a/components/sync/base/sync_prefs_unittest.cc
+++ b/components/sync/base/sync_prefs_unittest.cc
@@ -48,7 +48,7 @@
pref_service_.Set(prefs::kSyncDemographics, dict);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
std::unique_ptr<SyncPrefs> sync_prefs_;
};
@@ -290,7 +290,7 @@
SyncPrefs::RegisterProfilePrefs(pref_service_.registry());
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
};
diff --git a/components/sync/base/weak_handle_unittest.cc b/components/sync/base/weak_handle_unittest.cc
index 6a069cc..0d85771 100644
--- a/components/sync/base/weak_handle_unittest.cc
+++ b/components/sync/base/weak_handle_unittest.cc
@@ -63,7 +63,7 @@
h.Call(from_here, &Base::Test);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(WeakHandleTest, Uninitialized) {
diff --git a/components/sync/driver/async_directory_type_controller_unittest.cc b/components/sync/driver/async_directory_type_controller_unittest.cc
index fa8109a..7fbf063f 100644
--- a/components/sync/driver/async_directory_type_controller_unittest.cc
+++ b/components/sync/driver/async_directory_type_controller_unittest.cc
@@ -175,8 +175,7 @@
class SyncAsyncDirectoryTypeControllerTest : public testing::Test {
public:
SyncAsyncDirectoryTypeControllerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
backend_thread_("dbthread") {}
void SetUp() override {
@@ -250,7 +249,7 @@
static void SignalDone(WaitableEvent* done) { done->Signal(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread backend_thread_;
StartCallbackMock start_callback_;
diff --git a/components/sync/driver/backend_migrator_unittest.cc b/components/sync/driver/backend_migrator_unittest.cc
index 53ba320..993127a 100644
--- a/components/sync/driver/backend_migrator_unittest.cc
+++ b/components/sync/driver/backend_migrator_unittest.cc
@@ -87,7 +87,7 @@
BackendMigrator* migrator() { return migrator_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
ModelTypeSet preferred_types_;
NiceMock<DataTypeManagerMock> manager_;
NiceMock<base::MockCallback<base::RepeatingClosure>> reconfigure_callback_;
diff --git a/components/sync/driver/data_type_manager_impl_unittest.cc b/components/sync/driver/data_type_manager_impl_unittest.cc
index 165a8f7..38cc946 100644
--- a/components/sync/driver/data_type_manager_impl_unittest.cc
+++ b/components/sync/driver/data_type_manager_impl_unittest.cc
@@ -331,8 +331,8 @@
return configurer_.last_params();
}
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
DataTypeController::TypeMap controllers_;
FakeModelTypeConfigurer configurer_;
FakeDataTypeManagerObserver observer_;
diff --git a/components/sync/driver/frontend_data_type_controller_unittest.cc b/components/sync/driver/frontend_data_type_controller_unittest.cc
index cd7062b9..beb4bbb6 100644
--- a/components/sync/driver/frontend_data_type_controller_unittest.cc
+++ b/components/sync/driver/frontend_data_type_controller_unittest.cc
@@ -138,7 +138,7 @@
void PumpLoop() { base::RunLoop().RunUntilIdle(); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
ModelAssociatorMock* model_associator_;
ChangeProcessorMock* change_processor_;
std::unique_ptr<ModelAssociatorMock> model_associator_deleter_;
diff --git a/components/sync/driver/generic_change_processor_unittest.cc b/components/sync/driver/generic_change_processor_unittest.cc
index 9726db3..920a017b 100644
--- a/components/sync/driver/generic_change_processor_unittest.cc
+++ b/components/sync/driver/generic_change_processor_unittest.cc
@@ -39,8 +39,7 @@
static const ModelType kType = PREFERENCES;
SyncGenericChangeProcessorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
syncable_service_ptr_factory_(&fake_syncable_service_) {}
void SetUp() override {
@@ -101,7 +100,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<SyncMergeResult> sync_merge_result_;
std::unique_ptr<base::WeakPtrFactory<SyncMergeResult>>
diff --git a/components/sync/driver/glue/sync_engine_impl_unittest.cc b/components/sync/driver/glue/sync_engine_impl_unittest.cc
index 302d8a7..8b05c81 100644
--- a/components/sync/driver/glue/sync_engine_impl_unittest.cc
+++ b/components/sync/driver/glue/sync_engine_impl_unittest.cc
@@ -291,7 +291,7 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
base::Thread sync_thread_;
diff --git a/components/sync/driver/model_association_manager_unittest.cc b/components/sync/driver/model_association_manager_unittest.cc
index e5397ff..0e16fe8 100644
--- a/components/sync/driver/model_association_manager_unittest.cc
+++ b/components/sync/driver/model_association_manager_unittest.cc
@@ -54,8 +54,8 @@
SyncModelAssociationManagerTest() {}
protected:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
MockModelAssociationManagerDelegate delegate_;
DataTypeController::TypeMap controllers_;
};
diff --git a/components/sync/driver/model_type_controller_unittest.cc b/components/sync/driver/model_type_controller_unittest.cc
index 10c96dc..a5665a1 100644
--- a/components/sync/driver/model_type_controller_unittest.cc
+++ b/components/sync/driver/model_type_controller_unittest.cc
@@ -224,7 +224,7 @@
TestModelTypeController* controller() { return &controller_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<MockDelegate> mock_delegate_;
TestModelTypeConfigurer configurer_;
TestModelTypeProcessor processor_;
@@ -558,7 +558,7 @@
// Tests that StorageOption is honored when the controller has been constructed
// with two delegates.
TEST(ModelTypeControllerWithMultiDelegateTest, ToggleStorageOption) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
NiceMock<MockDelegate> delegate_on_disk;
NiceMock<MockDelegate> delegate_in_memory;
diff --git a/components/sync/driver/profile_sync_service_startup_unittest.cc b/components/sync/driver/profile_sync_service_startup_unittest.cc
index 8d2e1bc..40e28587 100644
--- a/components/sync/driver/profile_sync_service_startup_unittest.cc
+++ b/components/sync/driver/profile_sync_service_startup_unittest.cc
@@ -59,8 +59,7 @@
class ProfileSyncServiceStartupTest : public testing::Test {
public:
ProfileSyncServiceStartupTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
sync_prefs_(profile_sync_service_bundle_.pref_service()) {
profile_sync_service_bundle_.identity_test_env()
->SetAutomaticIssueOfAccessTokens(true);
@@ -138,11 +137,11 @@
}
void FastForwardUntilNoTasksRemain() {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ProfileSyncServiceBundle profile_sync_service_bundle_;
SyncPrefs sync_prefs_;
std::unique_ptr<ProfileSyncService> sync_service_;
diff --git a/components/sync/driver/profile_sync_service_unittest.cc b/components/sync/driver/profile_sync_service_unittest.cc
index 3776749..3f53f7b 100644
--- a/components/sync/driver/profile_sync_service_unittest.cc
+++ b/components/sync/driver/profile_sync_service_unittest.cc
@@ -316,7 +316,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ProfileSyncServiceBundle profile_sync_service_bundle_;
std::unique_ptr<ProfileSyncService> service_;
};
diff --git a/components/sync/driver/shared_change_processor_unittest.cc b/components/sync/driver/shared_change_processor_unittest.cc
index b131731..75ad7320 100644
--- a/components/sync/driver/shared_change_processor_unittest.cc
+++ b/components/sync/driver/shared_change_processor_unittest.cc
@@ -119,7 +119,7 @@
did_connect_ = true;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread model_thread_;
TestUserShare test_user_share_;
diff --git a/components/sync/driver/startup_controller_unittest.cc b/components/sync/driver/startup_controller_unittest.cc
index 996ab84..c0c0ea6 100644
--- a/components/sync/driver/startup_controller_unittest.cc
+++ b/components/sync/driver/startup_controller_unittest.cc
@@ -68,7 +68,7 @@
ModelTypeSet preferred_types_;
bool should_start_;
bool started_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<StartupController> controller_;
};
diff --git a/components/sync/driver/sync_auth_manager_unittest.cc b/components/sync/driver/sync_auth_manager_unittest.cc
index 2d80450..a5f2e8c 100644
--- a/components/sync/driver/sync_auth_manager_unittest.cc
+++ b/components/sync/driver/sync_auth_manager_unittest.cc
@@ -55,7 +55,7 @@
signin::IdentityTestEnvironment* identity_env() { return &identity_env_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_env_;
};
diff --git a/components/sync/driver/sync_session_durations_metrics_recorder_unittest.cc b/components/sync/driver/sync_session_durations_metrics_recorder_unittest.cc
index 1734766..f29366d 100644
--- a/components/sync/driver/sync_session_durations_metrics_recorder_unittest.cc
+++ b/components/sync/driver/sync_session_durations_metrics_recorder_unittest.cc
@@ -70,7 +70,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
signin::IdentityTestEnvironment identity_test_env_;
TestSyncService sync_service_;
diff --git a/components/sync/driver/sync_stopped_reporter_unittest.cc b/components/sync/driver/sync_stopped_reporter_unittest.cc
index 4b8103c..1f92867 100644
--- a/components/sync/driver/sync_stopped_reporter_unittest.cc
+++ b/components/sync/driver/sync_stopped_reporter_unittest.cc
@@ -75,7 +75,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
SyncStoppedReporter::Result request_result_;
diff --git a/components/sync/engine/net/http_bridge_unittest.cc b/components/sync/engine/net/http_bridge_unittest.cc
index cf840a3..d591fcfc 100644
--- a/components/sync/engine/net/http_bridge_unittest.cc
+++ b/components/sync/engine/net/http_bridge_unittest.cc
@@ -108,7 +108,7 @@
HttpBridge* bridge_for_race_test_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Separate thread for IO used by the HttpBridge.
base::Thread io_thread_;
};
diff --git a/components/sync/engine/sequenced_model_worker_unittest.cc b/components/sync/engine/sequenced_model_worker_unittest.cc
index fb1946a..ab4df359 100644
--- a/components/sync/engine/sequenced_model_worker_unittest.cc
+++ b/components/sync/engine/sequenced_model_worker_unittest.cc
@@ -66,7 +66,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool did_do_work_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
scoped_refptr<SequencedModelWorker> worker_;
diff --git a/components/sync/engine/sync_backend_registrar_unittest.cc b/components/sync/engine/sync_backend_registrar_unittest.cc
index c51b4acef..97fe941 100644
--- a/components/sync/engine/sync_backend_registrar_unittest.cc
+++ b/components/sync/engine/sync_backend_registrar_unittest.cc
@@ -105,7 +105,7 @@
}
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread db_thread_;
base::Thread sync_thread_;
diff --git a/components/sync/engine/ui_model_worker_unittest.cc b/components/sync/engine/ui_model_worker_unittest.cc
index 825553e..f752a43 100644
--- a/components/sync/engine/ui_model_worker_unittest.cc
+++ b/components/sync/engine/ui_model_worker_unittest.cc
@@ -56,8 +56,8 @@
}
protected:
- std::unique_ptr<base::test::ScopedTaskEnvironment> task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>();
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_ =
+ std::make_unique<base::test::TaskEnvironment>();
base::Thread sync_thread_;
scoped_refptr<UIModelWorker> worker_;
};
diff --git a/components/sync/engine_impl/apply_control_data_updates_unittest.cc b/components/sync/engine_impl/apply_control_data_updates_unittest.cc
index c9abe18f..bc17fdb 100644
--- a/components/sync/engine_impl/apply_control_data_updates_unittest.cc
+++ b/components/sync/engine_impl/apply_control_data_updates_unittest.cc
@@ -61,7 +61,7 @@
private:
// Needed for directory init.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
DISALLOW_COPY_AND_ASSIGN(ApplyControlDataUpdatesTest);
diff --git a/components/sync/engine_impl/directory_commit_contribution_unittest.cc b/components/sync/engine_impl/directory_commit_contribution_unittest.cc
index 91664701..4b18b23 100644
--- a/components/sync/engine_impl/directory_commit_contribution_unittest.cc
+++ b/components/sync/engine_impl/directory_commit_contribution_unittest.cc
@@ -93,7 +93,7 @@
private:
// Neeed to initialize the directory.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
};
diff --git a/components/sync/engine_impl/directory_update_handler_unittest.cc b/components/sync/engine_impl/directory_update_handler_unittest.cc
index d6b5e62..a1c5893 100644
--- a/components/sync/engine_impl/directory_update_handler_unittest.cc
+++ b/components/sync/engine_impl/directory_update_handler_unittest.cc
@@ -89,7 +89,7 @@
private:
// Needed to initialize the directory.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
scoped_refptr<FakeModelWorker> ui_worker_;
};
@@ -543,7 +543,7 @@
private:
// Needed to initialize the directory.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
std::unique_ptr<TestEntryFactory> entry_factory_;
diff --git a/components/sync/engine_impl/js_mutation_event_observer_unittest.cc b/components/sync/engine_impl/js_mutation_event_observer_unittest.cc
index 49f2424..640c6e0 100644
--- a/components/sync/engine_impl/js_mutation_event_observer_unittest.cc
+++ b/components/sync/engine_impl/js_mutation_event_observer_unittest.cc
@@ -31,7 +31,7 @@
private:
// This must be destroyed after the member variables below in order
// for WeakHandles to be destroyed properly.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
protected:
StrictMock<MockJsEventHandler> mock_js_event_handler_;
diff --git a/components/sync/engine_impl/js_sync_encryption_handler_observer_unittest.cc b/components/sync/engine_impl/js_sync_encryption_handler_observer_unittest.cc
index 6104cea..c3c74c1 100644
--- a/components/sync/engine_impl/js_sync_encryption_handler_observer_unittest.cc
+++ b/components/sync/engine_impl/js_sync_encryption_handler_observer_unittest.cc
@@ -36,7 +36,7 @@
private:
// This must be destroyed after the member variables below in order
// for WeakHandles to be destroyed properly.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
protected:
StrictMock<MockJsEventHandler> mock_js_event_handler_;
diff --git a/components/sync/engine_impl/js_sync_manager_observer_unittest.cc b/components/sync/engine_impl/js_sync_manager_observer_unittest.cc
index 2db7a91..56a82f5 100644
--- a/components/sync/engine_impl/js_sync_manager_observer_unittest.cc
+++ b/components/sync/engine_impl/js_sync_manager_observer_unittest.cc
@@ -34,7 +34,7 @@
private:
// This must be destroyed after the member variables below in order
// for WeakHandles to be destroyed properly.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
protected:
StrictMock<MockJsEventHandler> mock_js_event_handler_;
diff --git a/components/sync/engine_impl/model_type_registry_unittest.cc b/components/sync/engine_impl/model_type_registry_unittest.cc
index 8c3e93d2..c8a217d 100644
--- a/components/sync/engine_impl/model_type_registry_unittest.cc
+++ b/components/sync/engine_impl/model_type_registry_unittest.cc
@@ -103,7 +103,7 @@
return test_user_share_.user_share()->directory.get();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestUserShare test_user_share_;
CancelationSignal cancelation_signal_;
diff --git a/components/sync/engine_impl/sync_encryption_handler_impl_unittest.cc b/components/sync/engine_impl/sync_encryption_handler_impl_unittest.cc
index 98aa16d..88a3e6e 100644
--- a/components/sync/engine_impl/sync_encryption_handler_impl_unittest.cc
+++ b/components/sync/engine_impl/sync_encryption_handler_impl_unittest.cc
@@ -582,7 +582,7 @@
std::unique_ptr<SyncEncryptionHandlerImpl> encryption_handler_;
StrictMock<SyncEncryptionHandlerObserverMock> observer_;
TestIdFactory ids_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::test::ScopedFeatureList feature_list_;
base::RepeatingCallback<std::string()> fake_random_salt_generator_;
};
diff --git a/components/sync/engine_impl/sync_manager_impl_unittest.cc b/components/sync/engine_impl/sync_manager_impl_unittest.cc
index ae712c2c..32a2ca7 100644
--- a/components/sync/engine_impl/sync_manager_impl_unittest.cc
+++ b/components/sync/engine_impl/sync_manager_impl_unittest.cc
@@ -252,7 +252,7 @@
PassphraseType GetPassphraseType(BaseTransaction* trans);
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestUserShare test_user_share_;
};
@@ -1160,7 +1160,7 @@
private:
// Needed by |sync_manager_|.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Needed by |sync_manager_|.
base::ScopedTempDir temp_dir_;
// Sync Id's for the roots of the enabled datatypes.
diff --git a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
index 82ca0fa..a1fcd75 100644
--- a/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
+++ b/components/sync/engine_impl/sync_scheduler_impl_unittest.cc
@@ -96,8 +96,8 @@
public:
SyncSchedulerImplTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC,
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC,
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME),
syncer_(nullptr),
delay_(nullptr) {}
@@ -304,7 +304,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
static const base::TickClock* tick_clock_;
diff --git a/components/sync/engine_impl/syncer_proto_util_unittest.cc b/components/sync/engine_impl/syncer_proto_util_unittest.cc
index 41a9a9f..1d0b02c 100644
--- a/components/sync/engine_impl/syncer_proto_util_unittest.cc
+++ b/components/sync/engine_impl/syncer_proto_util_unittest.cc
@@ -140,7 +140,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
std::unique_ptr<SyncCycleContext> context_;
};
diff --git a/components/sync/engine_impl/syncer_unittest.cc b/components/sync/engine_impl/syncer_unittest.cc
index 2307002..0415464 100644
--- a/components/sync/engine_impl/syncer_unittest.cc
+++ b/components/sync/engine_impl/syncer_unittest.cc
@@ -519,7 +519,7 @@
ASSERT_FALSE(nudge_tracker_.IsGetUpdatesRequired(ProtocolTypes()));
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Some ids to aid tests. Only the root one's value is specific. The rest
// are named for test clarity.
diff --git a/components/sync/engine_impl/syncer_util_unittest.cc b/components/sync/engine_impl/syncer_util_unittest.cc
index fd8747f..7c937f8c 100644
--- a/components/sync/engine_impl/syncer_util_unittest.cc
+++ b/components/sync/engine_impl/syncer_util_unittest.cc
@@ -66,7 +66,7 @@
sync_pb::SyncEntity update;
UniquePosition test_position;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDirectorySetterUpper dir_maker_;
std::unique_ptr<TestEntryFactory> entry_factory_;
};
diff --git a/components/sync/engine_impl/uss_migrator_unittest.cc b/components/sync/engine_impl/uss_migrator_unittest.cc
index d3913f92..9a8cd8d 100644
--- a/components/sync/engine_impl/uss_migrator_unittest.cc
+++ b/components/sync/engine_impl/uss_migrator_unittest.cc
@@ -103,7 +103,7 @@
private:
syncable::Directory* directory() { return user_share()->directory.get(); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestUserShare test_user_share_;
CancelationSignal cancelation_signal_;
std::unique_ptr<TestEntryFactory> entry_factory_;
diff --git a/components/sync/js/sync_js_controller_unittest.cc b/components/sync/js/sync_js_controller_unittest.cc
index a96c92d..dffa14f2e 100644
--- a/components/sync/js/sync_js_controller_unittest.cc
+++ b/components/sync/js/sync_js_controller_unittest.cc
@@ -25,7 +25,7 @@
void PumpLoop() { base::RunLoop().RunUntilIdle(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(SyncJsControllerTest, Events) {
diff --git a/components/sync/model/sync_change_unittest.cc b/components/sync/model/sync_change_unittest.cc
index b90c5364..dca84f9b 100644
--- a/components/sync/model/sync_change_unittest.cc
+++ b/components/sync/model/sync_change_unittest.cc
@@ -23,7 +23,7 @@
class SyncChangeTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(SyncChangeTest, LocalDelete) {
diff --git a/components/sync/model/sync_data_unittest.cc b/components/sync/model/sync_data_unittest.cc
index 6dda1848..a1127d3 100644
--- a/components/sync/model/sync_data_unittest.cc
+++ b/components/sync/model/sync_data_unittest.cc
@@ -27,7 +27,7 @@
class SyncDataTest : public testing::Test {
protected:
SyncDataTest() = default;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_pb::EntitySpecifics specifics;
};
diff --git a/components/sync/model_impl/client_tag_based_model_type_processor_unittest.cc b/components/sync/model_impl/client_tag_based_model_type_processor_unittest.cc
index 242d9571..4cc77a9 100644
--- a/components/sync/model_impl/client_tag_based_model_type_processor_unittest.cc
+++ b/components/sync/model_impl/client_tag_based_model_type_processor_unittest.cc
@@ -373,7 +373,7 @@
// This sets SequencedTaskRunnerHandle on the current thread, which the type
// processor will pick up as the sync task runner.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The current mock queue, which is owned by |type_processor()|.
MockModelTypeWorker* worker_;
diff --git a/components/sync/model_impl/model_type_store_impl_unittest.cc b/components/sync/model_impl/model_type_store_impl_unittest.cc
index 69a6ef8..97a494f 100644
--- a/components/sync/model_impl/model_type_store_impl_unittest.cc
+++ b/components/sync/model_impl/model_type_store_impl_unittest.cc
@@ -176,7 +176,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ModelTypeStore> store_;
};
@@ -322,7 +322,7 @@
// Test that stores for different types that share the same backend don't
// interfere with each other's records.
TEST(ModelTypeStoreImplWithTwoStoreTest, TwoStoresWithSharedBackend) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<ModelTypeStore> store_1 =
ModelTypeStoreTestUtil::CreateInMemoryStoreForTest(AUTOFILL);
@@ -361,7 +361,7 @@
// Test that records that DeleteAllDataAndMetadata() does not delete data from
// another store when the backend is shared.
TEST(ModelTypeStoreImplWithTwoStoreTest, DeleteAllWithSharedBackend) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<ModelTypeStore> store_1 =
ModelTypeStoreTestUtil::CreateInMemoryStoreForTest(AUTOFILL);
diff --git a/components/sync/model_impl/syncable_service_based_bridge_unittest.cc b/components/sync/model_impl/syncable_service_based_bridge_unittest.cc
index 155e582..e22b4b1 100644
--- a/components/sync/model_impl/syncable_service_based_bridge_unittest.cc
+++ b/components/sync/model_impl/syncable_service_based_bridge_unittest.cc
@@ -159,7 +159,7 @@
const std::string kClientTagHash =
GenerateSyncableHash(kModelType, kClientTag);
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockSyncableService> syncable_service_;
testing::NiceMock<MockModelTypeChangeProcessor> mock_processor_;
base::MockCallback<ModelErrorHandler> mock_error_handler_;
@@ -526,7 +526,7 @@
ShouldDropIfCommitted) {
const std::string kClientTagHash = "clienttaghash1";
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<ModelTypeStore> store =
ModelTypeStoreTestUtil::CreateInMemoryStoreForTest();
SyncableServiceBasedBridge::InMemoryStore in_memory_store;
@@ -561,7 +561,7 @@
ShouldNotDropIfUnsynced) {
const std::string kClientTagHash = "clienttaghash1";
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<ModelTypeStore> store =
ModelTypeStoreTestUtil::CreateInMemoryStoreForTest();
SyncableServiceBasedBridge::InMemoryStore in_memory_store;
diff --git a/components/sync/syncable/directory_backing_store_unittest.cc b/components/sync/syncable/directory_backing_store_unittest.cc
index 0afd728..6d39c0f 100644
--- a/components/sync/syncable/directory_backing_store_unittest.cc
+++ b/components/sync/syncable/directory_backing_store_unittest.cc
@@ -115,7 +115,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
};
diff --git a/components/sync/syncable/directory_unittest.h b/components/sync/syncable/directory_unittest.h
index 4227950..7cf91a0c 100644
--- a/components/sync/syncable/directory_unittest.h
+++ b/components/sync/syncable/directory_unittest.h
@@ -94,7 +94,7 @@
int64_t server_version,
bool is_del);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<Directory> dir_;
NullDirectoryChangeDelegate delegate_;
FakeEncryptor encryptor_;
diff --git a/components/sync/syncable/syncable_unittest.cc b/components/sync/syncable/syncable_unittest.cc
index 55c0da9..608c10c 100644
--- a/components/sync/syncable/syncable_unittest.cc
+++ b/components/sync/syncable/syncable_unittest.cc
@@ -136,7 +136,7 @@
#define MAYBE_FailInitialWrite FailInitialWrite
#endif
TEST(OnDiskSyncableDirectory, MAYBE_FailInitialWrite) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
FakeEncryptor encryptor;
TestUnrecoverableErrorHandler handler;
base::ScopedTempDir temp_dir;
@@ -526,7 +526,7 @@
void TearDown() override {}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
FakeEncryptor encryptor_;
TestUnrecoverableErrorHandler handler_;
diff --git a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
index b89dbfc..82caf9e 100644
--- a/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
+++ b/components/sync_bookmarks/bookmark_data_type_controller_unittest.cc
@@ -125,7 +125,7 @@
history_service_->NotifyHistoryServiceLoaded();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<syncer::SyncApiComponentFactoryMock> components_factory_;
std::unique_ptr<BookmarkModel> bookmark_model_;
std::unique_ptr<HistoryMock> history_service_;
diff --git a/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc b/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc
index 59c3faf..2218df1 100644
--- a/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc
+++ b/components/sync_bookmarks/bookmark_model_type_processor_unittest.cc
@@ -169,7 +169,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<base::MockCallback<base::RepeatingClosure>> schedule_save_closure_;
BookmarkUndoService bookmark_undo_service_;
NiceMock<favicon::MockFaviconService> favicon_service_;
diff --git a/components/sync_device_info/device_info_sync_bridge_unittest.cc b/components/sync_device_info/device_info_sync_bridge_unittest.cc
index f8f8ad36..89003a4 100644
--- a/components/sync_device_info/device_info_sync_bridge_unittest.cc
+++ b/components/sync_device_info/device_info_sync_bridge_unittest.cc
@@ -399,7 +399,7 @@
int change_count_ = 0;
// In memory model type store needs to be able to post tasks.
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockModelTypeChangeProcessor> mock_processor_;
diff --git a/components/sync_sessions/favicon_cache_unittest.cc b/components/sync_sessions/favicon_cache_unittest.cc
index 0a46b39..564eafb 100644
--- a/components/sync_sessions/favicon_cache_unittest.cc
+++ b/components/sync_sessions/favicon_cache_unittest.cc
@@ -299,10 +299,10 @@
const std::string& icon_bytes,
base::Time last_visit_time = base::Time::Now());
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<favicon::MockFaviconService> mock_favicon_service_;
FaviconCache cache_;
@@ -313,8 +313,7 @@
};
SyncFaviconCacheTest::SyncFaviconCacheTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
cache_(&mock_favicon_service_, nullptr, kMaxSyncFavicons),
sync_processor_(new TestChangeProcessor),
sync_processor_wrapper_(new syncer::SyncChangeProcessorWrapperForTest(
diff --git a/components/sync_sessions/lost_navigations_recorder_unittest.cc b/components/sync_sessions/lost_navigations_recorder_unittest.cc
index f3efa70..89c6d91b 100644
--- a/components/sync_sessions/lost_navigations_recorder_unittest.cc
+++ b/components/sync_sessions/lost_navigations_recorder_unittest.cc
@@ -121,7 +121,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
int _id;
LostNavigationsRecorder recorder_;
syncer::TestDirectorySetterUpper dir_maker_;
diff --git a/components/sync_sessions/session_store_unittest.cc b/components/sync_sessions/session_store_unittest.cc
index 3cc21fa4..a11929d 100644
--- a/components/sync_sessions/session_store_unittest.cc
+++ b/components/sync_sessions/session_store_unittest.cc
@@ -175,7 +175,7 @@
~SessionStoreOpenTest() override {}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestingPrefServiceSimple pref_service_;
SessionSyncPrefs session_sync_prefs_;
std::unique_ptr<MockSyncSessionsClient> mock_sync_sessions_client_;
diff --git a/components/sync_sessions/session_sync_bridge_unittest.cc b/components/sync_sessions/session_sync_bridge_unittest.cc
index f4ced44..6308226 100644
--- a/components/sync_sessions/session_sync_bridge_unittest.cc
+++ b/components/sync_sessions/session_sync_bridge_unittest.cc
@@ -322,7 +322,7 @@
syncer::ModelTypeStore* underlying_store() { return store_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
const std::unique_ptr<syncer::ModelTypeStore> store_;
// Dependencies.
diff --git a/components/sync_user_events/user_event_service_impl_unittest.cc b/components/sync_user_events/user_event_service_impl_unittest.cc
index a0ca689..47d42ac 100644
--- a/components/sync_user_events/user_event_service_impl_unittest.cc
+++ b/components/sync_user_events/user_event_service_impl_unittest.cc
@@ -78,7 +78,7 @@
MockModelTypeChangeProcessor* mock_processor() { return &mock_processor_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
syncer::TestSyncService sync_service_;
testing::NiceMock<MockModelTypeChangeProcessor> mock_processor_;
TestGlobalIdMapper mapper_;
diff --git a/components/sync_user_events/user_event_sync_bridge_unittest.cc b/components/sync_user_events/user_event_sync_bridge_unittest.cc
index ed11221..ccaa0c0 100644
--- a/components/sync_user_events/user_event_sync_bridge_unittest.cc
+++ b/components/sync_user_events/user_event_sync_bridge_unittest.cc
@@ -185,7 +185,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::NiceMock<MockModelTypeChangeProcessor> mock_processor_;
TestGlobalIdMapper test_global_id_mapper_;
std::unique_ptr<UserEventSyncBridge> bridge_;
diff --git a/components/timers/alarm_timer_unittest.cc b/components/timers/alarm_timer_unittest.cc
index 166144e..6e45727 100644
--- a/components/timers/alarm_timer_unittest.cc
+++ b/components/timers/alarm_timer_unittest.cc
@@ -97,8 +97,8 @@
// that timers work properly in all configurations.
TEST(AlarmTimerTest, SimpleAlarmTimer) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
bool did_run = false;
@@ -112,8 +112,8 @@
}
TEST(AlarmTimerTest, SimpleAlarmTimer_Cancel) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
bool did_run_a = false;
AlarmTimerTester* a =
@@ -140,8 +140,8 @@
// If underlying timer does not handle this properly, we will crash or fail
// in full page heap environment.
TEST(AlarmTimerTest, SelfDeletingAlarmTimer) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
bool did_run = false;
@@ -155,8 +155,8 @@
}
TEST(AlarmTimerTest, AlarmTimerZeroDelay) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
bool did_run = false;
@@ -170,8 +170,8 @@
}
TEST(AlarmTimerTest, AlarmTimerZeroDelay_Cancel) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
bool did_run_a = false;
AlarmTimerTester* a =
@@ -202,8 +202,8 @@
// if debug heap checking is enabled.
bool did_run = false;
{
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
AlarmTimerTester a(&did_run, kTenMilliseconds, base::OnceClosure());
AlarmTimerTester b(&did_run, kTenMilliseconds, base::OnceClosure());
@@ -223,8 +223,8 @@
}
TEST(AlarmTimerTest, NonRepeatIsRunning) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
auto timer = SimpleAlarmTimer::CreateForTesting();
EXPECT_FALSE(timer->IsRunning());
@@ -244,8 +244,8 @@
}
TEST(AlarmTimerTest, RetainNonRepeatIsRunning) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
auto timer = SimpleAlarmTimer::CreateForTesting();
EXPECT_FALSE(timer->IsRunning());
@@ -290,8 +290,8 @@
TEST(AlarmTimerTest, ContinuationStopStart) {
ClearAllCallbackHappened();
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
auto timer = SimpleAlarmTimer::CreateForTesting();
timer->Start(FROM_HERE, base::TimeDelta::FromMilliseconds(10),
@@ -311,8 +311,8 @@
TEST(AlarmTimerTest, ContinuationReset) {
ClearAllCallbackHappened();
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
auto timer = SimpleAlarmTimer::CreateForTesting();
@@ -328,8 +328,8 @@
// Verify that no crash occurs if a timer is deleted while its callback is
// running.
TEST(AlarmTimerTest, DeleteTimerWhileCallbackIsRunning) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
@@ -347,8 +347,8 @@
// Verify that no crash occurs if a zero-delay timer is deleted while its
// callback is running.
TEST(AlarmTimerTest, DeleteTimerWhileCallbackIsRunningZeroDelay) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
// Will be deleted by the callback.
diff --git a/components/tracing/child/background_tracing_agent_impl_unittest.cc b/components/tracing/child/background_tracing_agent_impl_unittest.cc
index a32cb57..bbb6920 100644
--- a/components/tracing/child/background_tracing_agent_impl_unittest.cc
+++ b/components/tracing/child/background_tracing_agent_impl_unittest.cc
@@ -68,7 +68,7 @@
BackgroundTracingAgentClientRecorder* recorder() const { return recorder_; }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Remote<tracing::mojom::BackgroundTracingAgentProvider> provider_;
mojo::Remote<tracing::mojom::BackgroundTracingAgent> agent_;
mojo::UniqueReceiverSet<tracing::mojom::BackgroundTracingAgentProvider>
diff --git a/components/tracing/test/trace_event_perftest.cc b/components/tracing/test/trace_event_perftest.cc
index 684a8d2..bc2a7c71 100644
--- a/components/tracing/test/trace_event_perftest.cc
+++ b/components/tracing/test/trace_event_perftest.cc
@@ -90,7 +90,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
};
TEST_F(TraceEventPerfTest, Submit_10000_TRACE_EVENT0) {
diff --git a/components/translate/core/browser/translate_language_list_unittest.cc b/components/translate/core/browser/translate_language_list_unittest.cc
index 2383276..acea5af 100644
--- a/components/translate/core/browser/translate_language_list_unittest.cc
+++ b/components/translate/core/browser/translate_language_list_unittest.cc
@@ -31,7 +31,7 @@
"\"tl\":{\"en\":\"English\",\"ja\":\"Japanese\"}"
"}");
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
@@ -115,7 +115,7 @@
// list when translate is enabled by policy.
TEST(TranslateLanguageListTest, GetSupportedLanguagesFetch) {
// Set up fake network environment.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
@@ -168,7 +168,7 @@
// policy.
TEST(TranslateLanguageListTest, GetSupportedLanguagesNoFetch) {
// Set up fake network environment.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
network::TestURLLoaderFactory test_url_loader_factory;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory =
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
diff --git a/components/translate/core/browser/translate_ranker_impl_unittest.cc b/components/translate/core/browser/translate_ranker_impl_unittest.cc
index 1ab9980..3f0dd81 100644
--- a/components/translate/core/browser/translate_ranker_impl_unittest.cc
+++ b/components/translate/core/browser/translate_ranker_impl_unittest.cc
@@ -79,7 +79,7 @@
private:
// Sets up the task scheduling/task-runner environment for each test.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ukm::TestAutoSetUkmRecorder test_ukm_recorder_;
diff --git a/components/translate/core/browser/translate_script_unittest.cc b/components/translate/core/browser/translate_script_unittest.cc
index 1ef1e10..7bdadd0 100644
--- a/components/translate/core/browser/translate_script_unittest.cc
+++ b/components/translate/core/browser/translate_script_unittest.cc
@@ -55,7 +55,7 @@
const std::string& GetData() { return script_->data(); }
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
network::TestURLLoaderFactory* GetTestURLLoaderFactory() {
return &test_url_loader_factory_;
@@ -67,7 +67,7 @@
}
// Sets up the task scheduling/task-runner environment for each test.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The translate script.
std::unique_ptr<TranslateScript> script_;
diff --git a/components/ui_devtools/css_agent_unittest.cc b/components/ui_devtools/css_agent_unittest.cc
index fbbbedb1..acbbf5e9 100644
--- a/components/ui_devtools/css_agent_unittest.cc
+++ b/components/ui_devtools/css_agent_unittest.cc
@@ -89,7 +89,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
using StyleArray = protocol::Array<protocol::CSS::CSSStyle>;
std::pair<bool, std::unique_ptr<StyleArray>>
diff --git a/components/ui_devtools/devtools_server_unittest.cc b/components/ui_devtools/devtools_server_unittest.cc
index e75b267..3f5a6067 100644
--- a/components/ui_devtools/devtools_server_unittest.cc
+++ b/components/ui_devtools/devtools_server_unittest.cc
@@ -32,8 +32,8 @@
static constexpr int fake_port = 80;
base::CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kEnableUiDevTools);
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
network::mojom::NetworkServicePtr network_service_ptr;
network::mojom::NetworkServiceRequest network_service_request =
diff --git a/components/ukm/app_source_url_recorder_test.cc b/components/ukm/app_source_url_recorder_test.cc
index 444dedd..0aba6eb 100644
--- a/components/ukm/app_source_url_recorder_test.cc
+++ b/components/ukm/app_source_url_recorder_test.cc
@@ -29,7 +29,7 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestAutoSetUkmRecorder test_ukm_recorder_;
};
diff --git a/components/unified_consent/unified_consent_service_unittest.cc b/components/unified_consent/unified_consent_service_unittest.cc
index 1ff55483..33082bc 100644
--- a/components/unified_consent/unified_consent_service_unittest.cc
+++ b/components/unified_consent/unified_consent_service_unittest.cc
@@ -89,7 +89,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sync_preferences::TestingPrefServiceSyncable pref_service_;
signin::IdentityTestEnvironment identity_test_environment_;
TestSyncService sync_service_;
diff --git a/components/update_client/component_patcher_unittest.cc b/components/update_client/component_patcher_unittest.cc
index 016401f..78b1cc8 100644
--- a/components/update_client/component_patcher_unittest.cc
+++ b/components/update_client/component_patcher_unittest.cc
@@ -64,8 +64,7 @@
namespace update_client {
ComponentPatcherOperationTest::ComponentPatcherOperationTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
EXPECT_TRUE(unpack_dir_.CreateUniqueTempDir());
EXPECT_TRUE(input_dir_.CreateUniqueTempDir());
EXPECT_TRUE(installed_dir_.CreateUniqueTempDir());
@@ -94,7 +93,7 @@
op->Run(command_args.get(), input_dir_.GetPath(), unpack_dir_.GetPath(),
nullptr,
base::BindOnce(&TestCallback::Set, base::Unretained(&callback)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(true, callback.called_);
EXPECT_EQ(UnpackerError::kNone, callback.error_);
@@ -122,7 +121,7 @@
op->Run(command_args.get(), input_dir_.GetPath(), unpack_dir_.GetPath(),
installer_.get(),
base::BindOnce(&TestCallback::Set, base::Unretained(&callback)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(true, callback.called_);
EXPECT_EQ(UnpackerError::kNone, callback.error_);
@@ -159,7 +158,7 @@
op->Run(command_args.get(), input_dir_.GetPath(), unpack_dir_.GetPath(),
installer_.get(),
base::BindOnce(&TestCallback::Set, base::Unretained(&callback)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(true, callback.called_);
EXPECT_EQ(UnpackerError::kNone, callback.error_);
@@ -197,7 +196,7 @@
op->Run(command_args.get(), input_dir_.GetPath(), unpack_dir_.GetPath(),
installer_.get(),
base::BindOnce(&TestCallback::Set, base::Unretained(&callback)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(true, callback.called_);
EXPECT_EQ(UnpackerError::kNone, callback.error_);
diff --git a/components/update_client/component_patcher_unittest.h b/components/update_client/component_patcher_unittest.h
index bf5168c3..419bc23 100644
--- a/components/update_client/component_patcher_unittest.h
+++ b/components/update_client/component_patcher_unittest.h
@@ -29,7 +29,7 @@
~ComponentPatcherOperationTest() override;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir input_dir_;
base::ScopedTempDir installed_dir_;
base::ScopedTempDir unpack_dir_;
diff --git a/components/update_client/component_unpacker_unittest.cc b/components/update_client/component_unpacker_unittest.cc
index 617abcb..8a0315c 100644
--- a/components/update_client/component_unpacker_unittest.cc
+++ b/components/update_client/component_unpacker_unittest.cc
@@ -78,7 +78,7 @@
protected:
void RunThreads();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_ =
base::ThreadTaskRunnerHandle::Get();
base::RunLoop runloop_;
diff --git a/components/update_client/crx_downloader_unittest.cc b/components/update_client/crx_downloader_unittest.cc
index 03c90026..40bbd3bb4 100644
--- a/components/update_client/crx_downloader_unittest.cc
+++ b/components/update_client/crx_downloader_unittest.cc
@@ -91,7 +91,7 @@
static const int kExpectedContext = 0xaabb;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<network::SharedURLLoaderFactory>
test_shared_url_loader_factory_;
base::OnceClosure quit_closure_;
@@ -109,8 +109,7 @@
crx_context_(0),
num_download_complete_calls_(0),
num_progress_calls_(0),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
test_shared_url_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)) {}
@@ -186,7 +185,7 @@
}
void CrxDownloaderTest::RunThreadsUntilIdle() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
}
diff --git a/components/update_client/ping_manager_unittest.cc b/components/update_client/ping_manager_unittest.cc
index 60d078c..ef4cc49 100644
--- a/components/update_client/ping_manager_unittest.cc
+++ b/components/update_client/ping_manager_unittest.cc
@@ -58,13 +58,12 @@
std::string response_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::OnceClosure quit_closure_;
};
PingManagerTest::PingManagerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
config_ = base::MakeRefCounted<TestConfigurator>();
}
@@ -75,7 +74,7 @@
void PingManagerTest::TearDown() {
// Run the threads until they are idle to allow the clean up
// of the network interceptors on the IO thread.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ping_manager_ = nullptr;
}
diff --git a/components/update_client/request_sender_unittest.cc b/components/update_client/request_sender_unittest.cc
index e1e16d8..c27a5f0 100644
--- a/components/update_client/request_sender_unittest.cc
+++ b/components/update_client/request_sender_unittest.cc
@@ -57,7 +57,7 @@
void Quit();
void RunThreads();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<TestConfigurator> config_;
std::unique_ptr<RequestSender> request_sender_;
@@ -76,8 +76,7 @@
INSTANTIATE_TEST_SUITE_P(IsForeground, RequestSenderTest, ::testing::Bool());
RequestSenderTest::RequestSenderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
RequestSenderTest::~RequestSenderTest() {}
@@ -101,7 +100,7 @@
// Run the threads until they are idle to allow the clean up
// of the network interceptors on the IO thread.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
config_ = nullptr;
}
diff --git a/components/update_client/update_checker_unittest.cc b/components/update_client/update_checker_unittest.cc
index b7f2540f..c3da136 100644
--- a/components/update_client/update_checker_unittest.cc
+++ b/components/update_client/update_checker_unittest.cc
@@ -151,7 +151,7 @@
private:
scoped_refptr<UpdateContext> MakeMockUpdateContext() const;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::OnceClosure quit_closure_;
DISALLOW_COPY_AND_ASSIGN(UpdateCheckerTest);
@@ -161,8 +161,7 @@
INSTANTIATE_TEST_SUITE_P(Parameterized, UpdateCheckerTest, testing::Bool());
UpdateCheckerTest::UpdateCheckerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
UpdateCheckerTest::~UpdateCheckerTest() {
}
@@ -199,7 +198,7 @@
// The PostInterceptor requires the message loop to run to destruct correctly.
// TODO(sorin): This is fragile and should be fixed.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void UpdateCheckerTest::RunThreads() {
diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index cf5f69c..d60fe54 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -177,7 +177,7 @@
private:
static constexpr int kNumWorkerThreads_ = 2;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop runloop_;
scoped_refptr<update_client::TestConfigurator> config_ =
@@ -201,7 +201,7 @@
void UpdateClientTest::RunThreads() {
runloop_.Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
base::FilePath UpdateClientTest::TestFilePath(const char* file) {
diff --git a/components/upload_list/text_log_upload_list_unittest.cc b/components/upload_list/text_log_upload_list_unittest.cc
index ec03b3b8..34effc35 100644
--- a/components/upload_list/text_log_upload_list_unittest.cc
+++ b/components/upload_list/text_log_upload_list_unittest.cc
@@ -44,7 +44,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
DISALLOW_COPY_AND_ASSIGN(TextLogUploadListTest);
diff --git a/components/url_formatter/elide_url_unittest.cc b/components/url_formatter/elide_url_unittest.cc
index 90b919f..d7b5f58 100644
--- a/components/url_formatter/elide_url_unittest.cc
+++ b/components/url_formatter/elide_url_unittest.cc
@@ -266,8 +266,8 @@
TEST(TextEliderTest, TestElisionSpecialCases) {
#if defined(OS_WIN)
// Needed to bypass DCHECK in GetFallbackFont.
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
#endif
const std::string kEllipsisStr(gfx::kEllipsis);
const std::vector<Testcase> testcases = {
diff --git a/components/variations/child_process_field_trial_syncer_unittest.cc b/components/variations/child_process_field_trial_syncer_unittest.cc
index 2dffaa0..399b925 100644
--- a/components/variations/child_process_field_trial_syncer_unittest.cc
+++ b/components/variations/child_process_field_trial_syncer_unittest.cc
@@ -53,7 +53,7 @@
} // namespace
TEST(ChildProcessFieldTrialSyncerTest, FieldTrialState) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
// We don't use the descriptor here anyways so it's ok to pass -1.
base::FieldTrialList::CreateTrialsFromCommandLine(
diff --git a/components/variations/service/variations_service_unittest.cc b/components/variations/service/variations_service_unittest.cc
index a253b9b..65750a8 100644
--- a/components/variations/service/variations_service_unittest.cc
+++ b/components/variations/service/variations_service_unittest.cc
@@ -336,7 +336,7 @@
network::TestNetworkConnectionTracker* network_tracker_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<metrics::TestEnabledStateProvider> enabled_state_provider_;
std::unique_ptr<metrics::MetricsStateManager> metrics_state_manager_;
diff --git a/components/variations/synthetic_trial_registry_unittest.cc b/components/variations/synthetic_trial_registry_unittest.cc
index 0ab9374..2d8b27f 100644
--- a/components/variations/synthetic_trial_registry_unittest.cc
+++ b/components/variations/synthetic_trial_registry_unittest.cc
@@ -47,7 +47,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FieldTrialList field_trial_list_;
diff --git a/components/variations/variations_crash_keys_unittest.cc b/components/variations/variations_crash_keys_unittest.cc
index 633f2cd..0184a31 100644
--- a/components/variations/variations_crash_keys_unittest.cc
+++ b/components/variations/variations_crash_keys_unittest.cc
@@ -42,7 +42,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FieldTrialList field_trial_list_;
diff --git a/components/variations/variations_http_header_provider_unittest.cc b/components/variations/variations_http_header_provider_unittest.cc
index 6e7823d..5a2c792 100644
--- a/components/variations/variations_http_header_provider_unittest.cc
+++ b/components/variations/variations_http_header_provider_unittest.cc
@@ -61,7 +61,7 @@
};
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_Valid) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Valid experiment ids.
@@ -80,7 +80,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_ValidCommandLine) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Valid experiment ids.
@@ -99,7 +99,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_Invalid) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Invalid experiment ids.
@@ -122,7 +122,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, OnFieldTrialGroupFinalized) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
VariationsHttpHeaderProvider provider;
provider.InitVariationIDsCacheIfNeeded();
@@ -171,7 +171,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, GetVariationsString) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
CreateTrialAndAssociateId("t1", "g1", GOOGLE_WEB_PROPERTIES, 123);
@@ -185,7 +185,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, GetVariationsVector) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
CreateTrialAndAssociateId("t1", "g1", GOOGLE_WEB_PROPERTIES, 121);
diff --git a/components/variations/variations_id_collection_unittest.cc b/components/variations/variations_id_collection_unittest.cc
index 2c4f4bb..72810f6 100644
--- a/components/variations/variations_id_collection_unittest.cc
+++ b/components/variations/variations_id_collection_unittest.cc
@@ -74,7 +74,7 @@
VariationsIdCollection* collection() { return collection_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::FieldTrialList field_trial_list_;
std::unique_ptr<VariationsIdCollection> collection_;
std::vector<VariationID> new_ids_;
diff --git a/components/variations/variations_request_scheduler_mobile_unittest.cc b/components/variations/variations_request_scheduler_mobile_unittest.cc
index 0598816..91b3f56 100644
--- a/components/variations/variations_request_scheduler_mobile_unittest.cc
+++ b/components/variations/variations_request_scheduler_mobile_unittest.cc
@@ -49,7 +49,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundNoRun) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
@@ -76,7 +76,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundRun) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
@@ -102,7 +102,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundOnStartup) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
diff --git a/components/variations/variations_request_scheduler_unittest.cc b/components/variations/variations_request_scheduler_unittest.cc
index f751e793..a3b2b0f 100644
--- a/components/variations/variations_request_scheduler_unittest.cc
+++ b/components/variations/variations_request_scheduler_unittest.cc
@@ -12,7 +12,7 @@
namespace variations {
TEST(VariationsRequestSchedulerTest, ScheduleFetchShortly) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
const base::Closure task = base::DoNothing();
VariationsRequestScheduler scheduler(task);
diff --git a/components/viz/common/gl_helper_benchmark.cc b/components/viz/common/gl_helper_benchmark.cc
index 5e91c36b..03e4404 100644
--- a/components/viz/common/gl_helper_benchmark.cc
+++ b/components/viz/common/gl_helper_benchmark.cc
@@ -118,7 +118,7 @@
base::CloseFile(f);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<gpu::GLInProcessContext> context_;
gpu::gles2::GLES2Interface* gl_;
std::unique_ptr<GLHelper> helper_;
diff --git a/components/web_resource/resource_request_allowed_notifier_unittest.cc b/components/web_resource/resource_request_allowed_notifier_unittest.cc
index 58578123..42b1e90 100644
--- a/components/web_resource/resource_request_allowed_notifier_unittest.cc
+++ b/components/web_resource/resource_request_allowed_notifier_unittest.cc
@@ -119,8 +119,8 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
TestRequestAllowedNotifier resource_request_allowed_notifier_;
TestingPrefServiceSimple prefs_;
TestEulaAcceptedNotifier* eula_notifier_; // Weak, owned by RRAN.
diff --git a/components/web_resource/web_resource_service_unittest.cc b/components/web_resource/web_resource_service_unittest.cc
index cfb127c..4a07151 100644
--- a/components/web_resource/web_resource_service_unittest.cc
+++ b/components/web_resource/web_resource_service_unittest.cc
@@ -144,7 +144,7 @@
void CallStartFetch() { test_web_resource_service_->StartFetch(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
std::unique_ptr<TestingPrefServiceSimple> local_state_;
diff --git a/fuchsia/engine/browser/cookie_manager_impl_unittest.cc b/fuchsia/engine/browser/cookie_manager_impl_unittest.cc
index 1a7e5a9c..2771beca 100644
--- a/fuchsia/engine/browser/cookie_manager_impl_unittest.cc
+++ b/fuchsia/engine/browser/cookie_manager_impl_unittest.cc
@@ -47,7 +47,7 @@
public:
CookieManagerImplTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ base::test::TaskEnvironment::MainThreadType::IO),
network_service_(network::NetworkService::CreateForTesting()),
cookie_manager_(
base::BindRepeating(&CookieManagerImplTest::GetNetworkContext,
@@ -124,7 +124,7 @@
mojo::MakeRequest(&mojo_cookie_manager_));
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<network::NetworkService> network_service_;
network::mojom::NetworkContextPtr network_context_;
diff --git a/google_apis/drive/base_requests_server_unittest.cc b/google_apis/drive/base_requests_server_unittest.cc
index 9794e0c..4f6b34a 100644
--- a/google_apis/drive/base_requests_server_unittest.cc
+++ b/google_apis/drive/base_requests_server_unittest.cc
@@ -70,7 +70,7 @@
request_sender_ = std::make_unique<RequestSender>(
std::make_unique<DummyAuthService>(), test_shared_loader_factory_,
- scoped_task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
+ task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
TRAFFIC_ANNOTATION_FOR_TESTS);
ASSERT_TRUE(test_server_.InitializeAndListen());
@@ -86,8 +86,8 @@
return temp_dir_.GetPath().Append(file_name);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
net::EmbeddedTestServer test_server_;
std::unique_ptr<RequestSender> request_sender_;
std::unique_ptr<network::mojom::NetworkService> network_service_;
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc
index 2ff0eb9e..f78d2ea8 100644
--- a/google_apis/drive/base_requests_unittest.cc
+++ b/google_apis/drive/base_requests_unittest.cc
@@ -142,11 +142,11 @@
}
void SetUp() override {
- sender_.reset(new RequestSender(
- std::make_unique<DummyAuthService>(), test_shared_loader_factory_,
- scoped_task_environment_.GetMainThreadTaskRunner(),
- std::string(), /* custom user agent */
- TRAFFIC_ANNOTATION_FOR_TESTS));
+ sender_.reset(new RequestSender(std::make_unique<DummyAuthService>(),
+ test_shared_loader_factory_,
+ task_environment_.GetMainThreadTaskRunner(),
+ std::string(), /* custom user agent */
+ TRAFFIC_ANNOTATION_FOR_TESTS));
test_server_.RegisterRequestHandler(
base::Bind(&BaseRequestsTest::HandleRequest, base::Unretained(this)));
@@ -157,7 +157,7 @@
// Deleting the sender here will delete all request objects.
sender_.reset();
// Wait for any DeleteSoon tasks to run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
std::unique_ptr<net::test_server::HttpResponse> HandleRequest(
@@ -170,8 +170,8 @@
return std::move(response);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<network::mojom::NetworkService> network_service_;
std::unique_ptr<network::mojom::NetworkServiceClient> network_service_client_;
network::mojom::NetworkContextPtr network_context_;
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc
index 30c0b960..4dee98ef 100644
--- a/google_apis/drive/drive_api_requests_unittest.cc
+++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -154,7 +154,7 @@
void SetUp() override {
request_sender_ = std::make_unique<RequestSender>(
std::make_unique<DummyAuthService>(), test_shared_loader_factory_,
- scoped_task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
+ task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
TRAFFIC_ANNOTATION_FOR_TESTS);
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -212,8 +212,8 @@
testing_properties_.push_back(public_property);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
net::EmbeddedTestServer test_server_;
std::unique_ptr<RequestSender> request_sender_;
std::unique_ptr<DriveApiUrlGenerator> url_generator_;
diff --git a/google_apis/drive/files_list_request_runner_unittest.cc b/google_apis/drive/files_list_request_runner_unittest.cc
index 50d14ce..4b24138 100644
--- a/google_apis/drive/files_list_request_runner_unittest.cc
+++ b/google_apis/drive/files_list_request_runner_unittest.cc
@@ -101,7 +101,7 @@
void SetUp() override {
request_sender_ = std::make_unique<RequestSender>(
std::make_unique<DummyAuthService>(), test_shared_loader_factory_,
- scoped_task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
+ task_environment_.GetMainThreadTaskRunner(), kTestUserAgent,
TRAFFIC_ANNOTATION_FOR_TESTS);
test_server_.RegisterRequestHandler(
@@ -149,8 +149,8 @@
return std::move(fake_server_response_);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<RequestSender> request_sender_;
net::EmbeddedTestServer test_server_;
std::unique_ptr<FilesListRequestRunner> runner_;
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index b0163e7..c417b23 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -71,8 +71,7 @@
GaiaUrls::GetInstance()->oauth1_login_url().Resolve(
"?source=&issueuberauth=1")),
oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
test_shared_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)) {
@@ -123,7 +122,7 @@
return test_shared_loader_factory_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
std::vector<network::ResourceRequest> received_requests_;
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 9a543bd..5e1e81e 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -168,8 +168,7 @@
class GaiaOAuthClientTest : public testing::Test {
protected:
GaiaOAuthClientTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
void SetUp() override {
client_info_.client_id = "test_client_id";
@@ -187,11 +186,11 @@
// TestURLLoaderFactory to its clients via mojo pipes. In addition,
// some retries may have back off, so may need to advance (mock) time
// for them to finish, too.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory url_loader_factory_;
OAuthClientInfo client_info_;
@@ -284,8 +283,7 @@
injector.set_max_failure_count(21);
injector.set_results(kDummyGetTokensResult);
- base::TimeTicks start =
- scoped_task_environment_.GetMockTickClock()->NowTicks();
+ base::TimeTicks start = task_environment_.GetMockTickClock()->NowTicks();
GaiaOAuthClient auth(GetSharedURLLoaderFactory());
auth.GetTokensFromAuthCode(client_info_, "auth_code", -1, &delegate);
@@ -299,7 +297,7 @@
// 0.6 * 700ms * 1.4^(20-2) ~ 179s
//
// ... so the whole thing should take at least 307s
- EXPECT_GE(scoped_task_environment_.GetMockTickClock()->NowTicks() - start,
+ EXPECT_GE(task_environment_.GetMockTickClock()->NowTicks() - start,
base::TimeDelta::FromSeconds(307));
}
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
index 848ce5e..55c02323 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_impl_unittest.cc
@@ -115,7 +115,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockOAuth2AccessTokenConsumer consumer_;
URLLoaderFactoryInterceptor url_loader_factory_interceptor_;
network::TestURLLoaderFactory url_loader_factory_;
diff --git a/google_apis/gaia/oauth2_access_token_manager_unittest.cc b/google_apis/gaia/oauth2_access_token_manager_unittest.cc
index 16d3974..f446d62 100644
--- a/google_apis/gaia/oauth2_access_token_manager_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_manager_unittest.cc
@@ -298,7 +298,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
CoreAccountId account_id_;
network::TestURLLoaderFactory test_url_loader_factory_;
FakeOAuth2AccessTokenManagerDelegate delegate_;
diff --git a/google_apis/gaia/oauth2_api_call_flow_unittest.cc b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
index 1a9ba79..d93001e 100644
--- a/google_apis/gaia/oauth2_api_call_flow_unittest.cc
+++ b/google_apis/gaia/oauth2_api_call_flow_unittest.cc
@@ -100,7 +100,7 @@
AddFetchResult(url, succeeds, status, std::string());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
StrictMock<MockApiCallFlow> flow_;
diff --git a/google_apis/gcm/base/socket_stream_unittest.cc b/google_apis/gcm/base/socket_stream_unittest.cc
index 0c700007..83f859ab 100644
--- a/google_apis/gcm/base/socket_stream_unittest.cc
+++ b/google_apis/gcm/base/socket_stream_unittest.cc
@@ -79,7 +79,7 @@
void ResetInputStream();
void ResetOutputStream();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// SocketStreams and their data providers.
ReadList mock_reads_;
@@ -103,8 +103,7 @@
};
GCMSocketStreamTest::GCMSocketStreamTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
network_service_(network::NetworkService::CreateForTesting()),
url_request_context_(true /* delay_initialization */) {
diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
index 22e09f9..6ea68c5f 100644
--- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -301,7 +301,7 @@
std::unique_ptr<network::TestNetworkConnectionTracker>
network_connection_tracker_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestConnectionFactoryImpl factory_;
std::unique_ptr<base::RunLoop> run_loop_;
@@ -315,8 +315,7 @@
ConnectionFactoryImplTest::ConnectionFactoryImplTest()
: network_connection_tracker_(
network::TestNetworkConnectionTracker::CreateInstance()),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
factory_(base::BindRepeating(
&ConnectionFactoryImplTest::GetProxyResolvingSocketFactory,
base::Unretained(this)),
diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc
index 0977480..cd6b73f 100644
--- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc
+++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc
@@ -190,7 +190,7 @@
int last_error_;
net::AddressList address_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
std::unique_ptr<network::NetworkService> network_service_;
@@ -205,8 +205,7 @@
GCMConnectionHandlerImplTest::GCMConnectionHandlerImplTest()
: last_error_(0),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
network_service_(network::NetworkService::CreateForTesting()),
url_request_context_(true /* delay_initialization */) {
diff --git a/google_apis/gcm/engine/gcm_request_test_base.cc b/google_apis/gcm/engine/gcm_request_test_base.cc
index 327ad97..2bd18a59 100644
--- a/google_apis/gcm/engine/gcm_request_test_base.cc
+++ b/google_apis/gcm/engine/gcm_request_test_base.cc
@@ -129,7 +129,7 @@
int next_retry_delay_ms = kDefaultBackoffPolicy.initial_delay_ms;
next_retry_delay_ms *=
pow(kDefaultBackoffPolicy.multiply_factor, retry_count_);
- scoped_task_environment_.FastForwardBy(
+ task_environment_.FastForwardBy(
base::TimeDelta::FromMilliseconds(next_retry_delay_ms));
}
diff --git a/google_apis/gcm/engine/gcm_request_test_base.h b/google_apis/gcm/engine/gcm_request_test_base.h
index a076e4d..251ee8c 100644
--- a/google_apis/gcm/engine/gcm_request_test_base.h
+++ b/google_apis/gcm/engine/gcm_request_test_base.h
@@ -61,8 +61,8 @@
// Fast forward the timer used in the test to retry the request immediately.
void FastForwardToTriggerNextRetry();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc
index 39c7fd1..13bbdda 100644
--- a/google_apis/gcm/engine/mcs_client_unittest.cc
+++ b/google_apis/gcm/engine/mcs_client_unittest.cc
@@ -173,7 +173,7 @@
base::SimpleTestClock clock_;
base::ScopedTempDir temp_directory_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<GCMStore> gcm_store_;
@@ -209,10 +209,9 @@
}
void MCSClientTest::BuildMCSClient() {
- gcm_store_.reset(
- new GCMStoreImpl(temp_directory_.GetPath(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- base::WrapUnique<Encryptor>(new FakeEncryptor)));
+ gcm_store_.reset(new GCMStoreImpl(
+ temp_directory_.GetPath(), task_environment_.GetMainThreadTaskRunner(),
+ base::WrapUnique<Encryptor>(new FakeEncryptor)));
mcs_client_.reset(
new TestMCSClient(&clock_, &connection_factory_, gcm_store_.get(),
base::ThreadTaskRunnerHandle::Get(), &recorder_));
diff --git a/gpu/command_buffer/client/cmd_buffer_helper_test.cc b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
index 23e9fa3..9289511 100644
--- a/gpu/command_buffer/client/cmd_buffer_helper_test.cc
+++ b/gpu/command_buffer/client/cmd_buffer_helper_test.cc
@@ -202,7 +202,7 @@
std::vector<std::unique_ptr<CommandBufferEntry[]>> test_command_args_;
unsigned int test_command_next_id_;
Sequence sequence_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Checks immediate_entry_count_ changes based on RingBuffer state.
diff --git a/gpu/command_buffer/client/fenced_allocator_test.cc b/gpu/command_buffer/client/fenced_allocator_test.cc
index a5f7cd1..bcaf9d2 100644
--- a/gpu/command_buffer/client/fenced_allocator_test.cc
+++ b/gpu/command_buffer/client/fenced_allocator_test.cc
@@ -58,7 +58,7 @@
std::unique_ptr<CommandBufferDirect> command_buffer_;
std::unique_ptr<AsyncAPIMock> api_mock_;
std::unique_ptr<CommandBufferHelper> helper_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/client/mapped_memory_unittest.cc b/gpu/command_buffer/client/mapped_memory_unittest.cc
index 1a574fc..0f3a0a67 100644
--- a/gpu/command_buffer/client/mapped_memory_unittest.cc
+++ b/gpu/command_buffer/client/mapped_memory_unittest.cc
@@ -55,7 +55,7 @@
std::unique_ptr<CommandBufferDirectLocked> command_buffer_;
std::unique_ptr<AsyncAPIMock> api_mock_;
std::unique_ptr<CommandBufferHelper> helper_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/client/ring_buffer_test.cc b/gpu/command_buffer/client/ring_buffer_test.cc
index f7c0b6e..6cfdb87 100644
--- a/gpu/command_buffer/client/ring_buffer_test.cc
+++ b/gpu/command_buffer/client/ring_buffer_test.cc
@@ -85,7 +85,7 @@
std::unique_ptr<int8_t[]> buffer_;
int8_t* buffer_start_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
#ifndef _MSC_VER
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
index 74ace1d..1a6af3c 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h
@@ -804,7 +804,7 @@
SharedImageManager shared_image_manager_;
scoped_refptr<ContextGroup> group_;
MockGLStates gl_states_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockCopyTextureResourceManager* copy_texture_manager_; // not owned
MockCopyTexImageResourceManager* copy_tex_image_blitter_; // not owned
diff --git a/gpu/command_buffer/service/gpu_service_test.h b/gpu/command_buffer/service/gpu_service_test.h
index 8cf3a83..7fe4aa2 100644
--- a/gpu/command_buffer/service/gpu_service_test.h
+++ b/gpu/command_buffer/service/gpu_service_test.h
@@ -42,7 +42,7 @@
bool ran_teardown_;
scoped_refptr<gl::GLContextStub> context_;
scoped_refptr<gl::GLSurfaceStub> surface_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
} // namespace gles2
diff --git a/gpu/command_buffer/service/raster_decoder_unittest_base.h b/gpu/command_buffer/service/raster_decoder_unittest_base.h
index 042994e3..226b2e7 100644
--- a/gpu/command_buffer/service/raster_decoder_unittest_base.h
+++ b/gpu/command_buffer/service/raster_decoder_unittest_base.h
@@ -235,7 +235,7 @@
MemoryTypeTracker memory_tracker_;
std::vector<std::unique_ptr<SharedImageRepresentationFactoryRef>>
shared_images_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
gles2::MockCopyTextureResourceManager* copy_texture_manager_; // not owned
GLuint next_fake_texture_client_id_ = 271828;
};
diff --git a/gpu/command_buffer/tests/gl_tests_main.cc b/gpu/command_buffer/tests/gl_tests_main.cc
index c152dc7..2fbba5d 100644
--- a/gpu/command_buffer/tests/gl_tests_main.cc
+++ b/gpu/command_buffer/tests/gl_tests_main.cc
@@ -36,16 +36,15 @@
base::TestSuite::Initialize();
base::FeatureList::InitializeInstance(std::string(), std::string());
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
#if defined(USE_OZONE)
// Make Ozone run in single-process mode.
ui::OzonePlatform::InitParams params;
params.single_process = true;
params.using_mojo = true;
- // This initialization must be done after ScopedTaskEnvironment has
+ // This initialization must be done after TaskEnvironment has
// initialized the UI thread.
ui::OzonePlatform::InitializeForUI(params);
ui::OzonePlatform::InitializeForGPU(params);
@@ -56,7 +55,7 @@
}
private:
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
};
} // namespace
diff --git a/gpu/ipc/common/android/image_reader_gl_owner_unittest.cc b/gpu/ipc/common/android/image_reader_gl_owner_unittest.cc
index f13ce719..4b5641d1a 100644
--- a/gpu/ipc/common/android/image_reader_gl_owner_unittest.cc
+++ b/gpu/ipc/common/android/image_reader_gl_owner_unittest.cc
@@ -79,7 +79,7 @@
scoped_refptr<gl::GLContext> context_;
scoped_refptr<gl::GLShareGroup> share_group_;
scoped_refptr<gl::GLSurface> surface_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(ImageReaderGLOwnerTest, ImageReaderObjectCreation) {
diff --git a/gpu/ipc/common/android/surface_texture_gl_owner_unittest.cc b/gpu/ipc/common/android/surface_texture_gl_owner_unittest.cc
index ed91bd1..189b06a 100644
--- a/gpu/ipc/common/android/surface_texture_gl_owner_unittest.cc
+++ b/gpu/ipc/common/android/surface_texture_gl_owner_unittest.cc
@@ -74,7 +74,7 @@
scoped_refptr<gl::GLContext> context_;
scoped_refptr<gl::GLShareGroup> share_group_;
scoped_refptr<gl::GLSurface> surface_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(SurfaceTextureGLOwnerTest, OwnerReturnsServiceId) {
diff --git a/gpu/ipc/common/mojom_traits_unittest.cc b/gpu/ipc/common/mojom_traits_unittest.cc
index a1fa2b6..ca39a30 100644
--- a/gpu/ipc/common/mojom_traits_unittest.cc
+++ b/gpu/ipc/common/mojom_traits_unittest.cc
@@ -82,7 +82,7 @@
std::move(callback).Run(prefs);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
diff --git a/gpu/ipc/host/shader_disk_cache_unittest.cc b/gpu/ipc/host/shader_disk_cache_unittest.cc
index ea35670d..417ad71 100644
--- a/gpu/ipc/host/shader_disk_cache_unittest.cc
+++ b/gpu/ipc/host/shader_disk_cache_unittest.cc
@@ -40,13 +40,13 @@
void TearDown() override {
factory_.RemoveCacheInfo(kDefaultClientId);
- // Run all pending tasks before destroying ScopedTaskEnvironment. Otherwise,
+ // Run all pending tasks before destroying TaskEnvironment. Otherwise,
// SimpleEntryImpl instances bound to pending tasks are destroyed in an
// incorrect state (see |state_| DCHECK in ~SimpleEntryImpl).
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
ShaderCacheFactory factory_;
diff --git a/ios/chrome/app/application_delegate/memory_warning_helper_unittest.mm b/ios/chrome/app/application_delegate/memory_warning_helper_unittest.mm
index aa065bf..393e8ea 100644
--- a/ios/chrome/app/application_delegate/memory_warning_helper_unittest.mm
+++ b/ios/chrome/app/application_delegate/memory_warning_helper_unittest.mm
@@ -52,8 +52,8 @@
void RunMessageLoop() { run_loop_.Run(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
base::RunLoop run_loop_;
base::MemoryPressureListener::MemoryPressureLevel memory_pressure_level_;
std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
diff --git a/ios/chrome/app/spotlight/spotlight_manager_unittest.mm b/ios/chrome/app/spotlight/spotlight_manager_unittest.mm
index cd0a4e31..9adda7e 100644
--- a/ios/chrome/app/spotlight/spotlight_manager_unittest.mm
+++ b/ios/chrome/app/spotlight/spotlight_manager_unittest.mm
@@ -87,7 +87,7 @@
~SpotlightManagerTest() override { [bookmarksSpotlightManager_ shutdown]; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
testing::StrictMock<favicon::MockFaviconService> mock_favicon_service_;
std::unique_ptr<favicon::LargeIconServiceImpl> large_icon_service_;
base::CancelableTaskTracker cancelable_task_tracker_;
diff --git a/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm b/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
index 21e0a57..a34a8573 100644
--- a/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
+++ b/ios/chrome/browser/app_launcher/app_launcher_tab_helper_unittest.mm
@@ -184,7 +184,7 @@
return entry->IsRead() == expected_read_status;
}
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
web::TestWebState web_state_;
FakeNavigationManager* navigation_manager_ = nullptr;
diff --git a/ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm b/ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm
index d3c93d75..6d52d74 100644
--- a/ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm
+++ b/ios/chrome/browser/autofill/manual_fill/passwords_fetcher_unittest.mm
@@ -129,7 +129,7 @@
GetPasswordStore()->AddLogin(*std::move(form));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
};
diff --git a/ios/chrome/browser/download/download_directory_util_unittest.mm b/ios/chrome/browser/download/download_directory_util_unittest.mm
index ec6ad90..7df07d48 100644
--- a/ios/chrome/browser/download/download_directory_util_unittest.mm
+++ b/ios/chrome/browser/download/download_directory_util_unittest.mm
@@ -22,7 +22,7 @@
// Tests that DeleteDownloadsDirectory() actually deletes the directory.
TEST_F(DownloadDirectoryTest, Deletion) {
- base::test::ScopedTaskEnvironment envoronment;
+ base::test::TaskEnvironment envoronment;
// Create a new file in downloads directory.
base::FilePath dir;
diff --git a/ios/chrome/browser/history/history_tab_helper_unittest.mm b/ios/chrome/browser/history/history_tab_helper_unittest.mm
index e242e90..fc1da2d 100644
--- a/ios/chrome/browser/history/history_tab_helper_unittest.mm
+++ b/ios/chrome/browser/history/history_tab_helper_unittest.mm
@@ -66,7 +66,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
web::TestWebState web_state_;
base::CancelableTaskTracker tracker_;
diff --git a/ios/chrome/browser/infobars/infobar_badge_tab_helper_unittest.mm b/ios/chrome/browser/infobars/infobar_badge_tab_helper_unittest.mm
index 1b72d55..6bcc799 100644
--- a/ios/chrome/browser/infobars/infobar_badge_tab_helper_unittest.mm
+++ b/ios/chrome/browser/infobars/infobar_badge_tab_helper_unittest.mm
@@ -195,7 +195,7 @@
return InfoBarManagerImpl::FromWebState(&web_state_);
}
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
InfobarBadgeTabHelperTestDelegate* infobar_badge_tab_delegate_;
std::unique_ptr<ios::ChromeBrowserState> browser_state_;
FakeInfobarContainerCoordinator* infobar_container_coordinator_;
diff --git a/ios/chrome/browser/json_parser/in_process_json_parser_unittest.cc b/ios/chrome/browser/json_parser/in_process_json_parser_unittest.cc
index 5331f846..fa6f80fc 100644
--- a/ios/chrome/browser/json_parser/in_process_json_parser_unittest.cc
+++ b/ios/chrome/browser/json_parser/in_process_json_parser_unittest.cc
@@ -11,7 +11,7 @@
#include "testing/gtest/include/gtest/gtest.h"
TEST(InProcessJsonParserTest, TestSuccess) {
- base::test::ScopedTaskEnvironment environment;
+ base::test::TaskEnvironment environment;
base::RunLoop run_loop;
InProcessJsonParser::Parse(
@@ -34,7 +34,7 @@
}
TEST(InProcessJsonParserTest, TestFailure) {
- base::test::ScopedTaskEnvironment environment;
+ base::test::TaskEnvironment environment;
base::RunLoop run_loop;
InProcessJsonParser::Parse(
diff --git a/ios/chrome/browser/metrics/tab_usage_recorder_unittest.mm b/ios/chrome/browser/metrics/tab_usage_recorder_unittest.mm
index 3b8f531..d8a5a2c1 100644
--- a/ios/chrome/browser/metrics/tab_usage_recorder_unittest.mm
+++ b/ios/chrome/browser/metrics/tab_usage_recorder_unittest.mm
@@ -89,7 +89,7 @@
tab_usage_recorder_.termination_timestamps_.push_back(time);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeWebStateListDelegate web_state_list_delegate_;
WebStateList web_state_list_;
base::HistogramTester histogram_tester_;
diff --git a/ios/chrome/browser/net/retryable_url_fetcher_unittest.mm b/ios/chrome/browser/net/retryable_url_fetcher_unittest.mm
index 54c1e91..3f1b3eb 100644
--- a/ios/chrome/browser/net/retryable_url_fetcher_unittest.mm
+++ b/ios/chrome/browser/net/retryable_url_fetcher_unittest.mm
@@ -79,7 +79,7 @@
test_delegate_ = [[TestRetryableURLFetcherDelegate alloc] init];
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory>
test_shared_url_loader_factory_;
@@ -98,7 +98,7 @@
url, base::SysNSStringToUTF8(kFakeResponseString), net::HTTP_OK);
[retryableFetcher startFetch];
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1U, [test_delegate_ responsesProcessed]);
}
@@ -114,7 +114,7 @@
test_url_loader_factory_.AddResponse(url, "", net::HTTP_NOT_FOUND);
[retryableFetcher startFetch];
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0U, [test_delegate_ responsesProcessed]);
}
@@ -132,7 +132,7 @@
[failing_delegate setResponsesProcessed:0U];
[retryableFetcher startFetch];
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Verify that a response has been received, even if the failing delegate
// received a nil in processSuccessResponse to indicate the failure.
diff --git a/ios/chrome/browser/passwords/password_controller_unittest.mm b/ios/chrome/browser/passwords/password_controller_unittest.mm
index 5924bee3..79c1c54 100644
--- a/ios/chrome/browser/passwords/password_controller_unittest.mm
+++ b/ios/chrome/browser/passwords/password_controller_unittest.mm
@@ -1128,7 +1128,7 @@
// The test case below does not need the heavy fixture from above, but it
// needs to use MockWebState.
TEST_F(PasswordControllerTestSimple, SaveOnNonHTMLLandingPage) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestChromeBrowserState::Builder builder;
std::unique_ptr<TestChromeBrowserState> browser_state(builder.Build());
MockWebState web_state;
diff --git a/ios/chrome/browser/payments/ios_payment_instrument_finder_unittest.mm b/ios/chrome/browser/payments/ios_payment_instrument_finder_unittest.mm
index 36905ede..5fa4dc8 100644
--- a/ios/chrome/browser/payments/ios_payment_instrument_finder_unittest.mm
+++ b/ios/chrome/browser/payments/ios_payment_instrument_finder_unittest.mm
@@ -40,8 +40,7 @@
class PaymentRequestIOSPaymentInstrumentFinderTest : public PlatformTest {
public:
PaymentRequestIOSPaymentInstrumentFinderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
shared_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)),
@@ -156,7 +155,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
diff --git a/ios/chrome/browser/payments/ios_payment_instrument_launcher_unittest.mm b/ios/chrome/browser/payments/ios_payment_instrument_launcher_unittest.mm
index d343ea6..def5302 100644
--- a/ios/chrome/browser/payments/ios_payment_instrument_launcher_unittest.mm
+++ b/ios/chrome/browser/payments/ios_payment_instrument_launcher_unittest.mm
@@ -91,7 +91,7 @@
launcher.payment_request_id_ = "some-payment-request-id";
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
autofill::TestPersonalDataManager test_personal_data_manager_;
web::TestWebState web_state_;
diff --git a/ios/chrome/browser/payments/payment_request_unittest.mm b/ios/chrome/browser/payments/payment_request_unittest.mm
index 61fe4aa..60080dd 100644
--- a/ios/chrome/browser/payments/payment_request_unittest.mm
+++ b/ios/chrome/browser/payments/payment_request_unittest.mm
@@ -103,7 +103,7 @@
return options;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
autofill::TestPersonalDataManager test_personal_data_manager_;
web::TestWebState web_state_;
diff --git a/ios/chrome/browser/payments/payment_response_helper_unittest.mm b/ios/chrome/browser/payments/payment_response_helper_unittest.mm
index 8cd7f317a..a058d69d 100644
--- a/ios/chrome/browser/payments/payment_response_helper_unittest.mm
+++ b/ios/chrome/browser/payments/payment_response_helper_unittest.mm
@@ -94,7 +94,7 @@
TestPaymentRequest* payment_request() { return payment_request_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_evironment_;
+ base::test::TaskEnvironment scoped_task_evironment_;
autofill::AutofillProfile profile_;
autofill::CreditCard credit_card_;
diff --git a/ios/chrome/browser/reading_list/url_downloader_unittest.mm b/ios/chrome/browser/reading_list/url_downloader_unittest.mm
index 42e66bcd..13fbea9f 100644
--- a/ios/chrome/browser/reading_list/url_downloader_unittest.mm
+++ b/ios/chrome/browser/reading_list/url_downloader_unittest.mm
@@ -165,7 +165,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::WeakWrapperSharedURLLoaderFactory>
diff --git a/ios/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.mm b/ios/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.mm
index 54182dc9..1b4e6206 100644
--- a/ios/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.mm
+++ b/ios/chrome/browser/send_tab_to_self/send_tab_to_self_util_unittest.mm
@@ -66,7 +66,7 @@
protected:
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
std::unique_ptr<ios::ChromeBrowserState> browser_state_;
@@ -82,7 +82,7 @@
}
TEST_F(SendTabToSelfUtilTest, AreFlagsEnabled) {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
scoped_feature_list_.InitWithFeatures(
{switches::kSyncSendTabToSelf, kSendTabToSelfShowSendingUI}, {});
@@ -91,7 +91,7 @@
}
TEST_F(SendTabToSelfUtilTest, AreFlagsDisabled) {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
scoped_feature_list_.InitWithFeatures(
{}, {switches::kSyncSendTabToSelf, kSendTabToSelfShowSendingUI});
@@ -100,7 +100,7 @@
}
TEST_F(SendTabToSelfUtilTest, IsReceivingEnabled) {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
scoped_feature_list_.InitWithFeatures({switches::kSyncSendTabToSelf},
{kSendTabToSelfShowSendingUI});
@@ -109,7 +109,7 @@
}
TEST_F(SendTabToSelfUtilTest, IsOnlySendingEnabled) {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
scoped_feature_list_.InitWithFeatures({kSendTabToSelfShowSendingUI},
{switches::kSyncSendTabToSelf});
diff --git a/ios/chrome/browser/sessions/session_service_ios_unittest.mm b/ios/chrome/browser/sessions/session_service_ios_unittest.mm
index 99a51de..0212ee9 100644
--- a/ios/chrome/browser/sessions/session_service_ios_unittest.mm
+++ b/ios/chrome/browser/sessions/session_service_ios_unittest.mm
@@ -96,7 +96,7 @@
private:
base::ScopedTempDir scoped_temp_directory_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
SessionServiceIOS* session_service_;
NSString* directory_;
diff --git a/ios/chrome/browser/ui/activity_services/chrome_activity_item_thumbnail_generator_unittest.mm b/ios/chrome/browser/ui/activity_services/chrome_activity_item_thumbnail_generator_unittest.mm
index 6289d8e..ccff551b2 100644
--- a/ios/chrome/browser/ui/activity_services/chrome_activity_item_thumbnail_generator_unittest.mm
+++ b/ios/chrome/browser/ui/activity_services/chrome_activity_item_thumbnail_generator_unittest.mm
@@ -39,7 +39,7 @@
}
FakeSnapshotGeneratorDelegate* delegate_ = nil;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
web::TestWebState test_web_state_;
};
diff --git a/ios/chrome/browser/ui/infobars/infobar_container_coordinator_unittest.mm b/ios/chrome/browser/ui/infobars/infobar_container_coordinator_unittest.mm
index a951007d..b43a860 100644
--- a/ios/chrome/browser/ui/infobars/infobar_container_coordinator_unittest.mm
+++ b/ios/chrome/browser/ui/infobars/infobar_container_coordinator_unittest.mm
@@ -184,7 +184,7 @@
web_state_list_->GetActiveWebState());
}
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
std::unique_ptr<ios::ChromeBrowserState> browser_state_;
InfobarContainerCoordinator* infobar_container_coordinator_;
base::test::ScopedFeatureList feature_list_;
diff --git a/ios/chrome/browser/ui/ntp/ntp_tile_saver_unittest.mm b/ios/chrome/browser/ui/ntp/ntp_tile_saver_unittest.mm
index a3c7503..d5c00a7 100644
--- a/ios/chrome/browser/ui/ntp/ntp_tile_saver_unittest.mm
+++ b/ios/chrome/browser/ui/ntp/ntp_tile_saver_unittest.mm
@@ -160,7 +160,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_evironment_;
+ base::test::TaskEnvironment scoped_task_evironment_;
UIImage* mock_image_;
};
diff --git a/ios/chrome/browser/ui/omnibox/omnibox_view_ios_unittest.mm b/ios/chrome/browser/ui/omnibox/omnibox_view_ios_unittest.mm
index 8799aef..7392f39 100644
--- a/ios/chrome/browser/ui/omnibox/omnibox_view_ios_unittest.mm
+++ b/ios/chrome/browser/ui/omnibox/omnibox_view_ios_unittest.mm
@@ -36,7 +36,7 @@
// Mock for the OmniboxTextFieldIOS.
id mockOmniboxTextfield_;
// Message loop for the main test thread.
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
};
TEST_F(OmniboxViewIOSTest, copyAddsTextToPasteboard) {
diff --git a/ios/chrome/browser/ui/open_in/open_in_controller_unittest.mm b/ios/chrome/browser/ui/open_in/open_in_controller_unittest.mm
index 09161c0..02468eb 100644
--- a/ios/chrome/browser/ui/open_in/open_in_controller_unittest.mm
+++ b/ios/chrome/browser/ui/open_in/open_in_controller_unittest.mm
@@ -73,7 +73,7 @@
pdf_data.length);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory>
test_shared_url_loader_factory_;
@@ -102,7 +102,7 @@
std::string pdf_str = CreatePdfString();
test_url_loader_factory_.SimulateResponseForPendingRequest(
pending_request->request.url.spec(), pdf_str);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
histogram_tester_.ExpectBucketCount(kOpenInDownloadResultHistogram,
static_cast<base::HistogramBase::Sample>(
OpenInDownloadResult::kSucceeded),
@@ -127,7 +127,7 @@
// Only use half the string so the downloaded PDF is corrupted.
test_url_loader_factory_.SimulateResponseForPendingRequest(
pending_request->request.url.spec(), pdf_str.substr(pdf_str.size() / 2));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
histogram_tester_.ExpectBucketCount(
kOpenInDownloadResultHistogram,
static_cast<base::HistogramBase::Sample>(OpenInDownloadResult::kFailed),
diff --git a/ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller_unittest.mm
index b35cb68..6a302bdf 100644
--- a/ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/clear_browsing_data/time_range_selector_table_view_controller_unittest.mm
@@ -33,8 +33,7 @@
: public ChromeTableViewControllerTest {
protected:
TimeRangeSelectorTableViewControllerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
ChromeTableViewControllerTest::SetUp();
@@ -66,7 +65,7 @@
EXPECT_EQ(accessory_type, cell.accessoryType);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefService> pref_service_;
TimeRangeSelectorTableViewController* time_range_selector_controller_;
};
diff --git a/ios/chrome/browser/ui/settings/dataplan_usage_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/dataplan_usage_table_view_controller_unittest.mm
index 6033ac8..de74080 100644
--- a/ios/chrome/browser/ui/settings/dataplan_usage_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/dataplan_usage_table_view_controller_unittest.mm
@@ -57,8 +57,8 @@
sync_preferences::PrefServiceMockFactory factory;
base::FilePath path("DataplanUsageTableViewControllerTest.pref");
- factory.SetUserPrefsFile(
- path, scoped_task_environment_.GetMainThreadTaskRunner().get());
+ factory.SetUserPrefsFile(path,
+ task_environment_.GetMainThreadTaskRunner().get());
return factory.Create(registry.get());
}
@@ -71,8 +71,8 @@
EXPECT_EQ(accessory_type, cell.accessoryType);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<PrefService> pref_service_;
DataplanUsageTableViewController* dataplanController_;
};
diff --git a/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm b/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm
index 4f74b4c..fb101c36 100644
--- a/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm
+++ b/ios/chrome/browser/ui/settings/language/language_settings_mediator_unittest.mm
@@ -89,8 +89,7 @@
class LanguageSettingsMediatorTest : public PlatformTest {
protected:
LanguageSettingsMediatorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
// Create BrowserState.
TestChromeBrowserState::Builder test_cbs_builder;
test_cbs_builder.SetPrefService(CreatePrefService());
@@ -135,7 +134,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
std::unique_ptr<translate::TranslatePrefs> translate_prefs_;
FakeLanguageSettingsConsumer* consumer_;
diff --git a/ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm b/ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm
index 1522c80..594d5b88 100644
--- a/ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm
+++ b/ios/chrome/browser/ui/settings/password/password_exporter_unittest.mm
@@ -120,7 +120,7 @@
id password_exporter_delegate_;
PasswordExporter* password_exporter_;
MockReauthenticationModule* mock_reauthentication_module_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
};
@@ -140,7 +140,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(fake_password_file_writer.writeAttempted);
@@ -171,7 +171,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Use @try/@catch as -reject raises an exception.
@try {
@@ -208,7 +208,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Use @try/@catch as -reject raises an exception.
@try {
@@ -246,7 +246,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_OCMOCK_VERIFY(password_exporter_delegate_);
} @catch (NSException* exception) {
// The exception is raised when
@@ -261,7 +261,7 @@
// Make sure this test doesn't pass only because file writing hasn't finished
// yet.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Serializing passwords has finished, but reauthentication was not
// successful, so writing the file was not attempted.
@@ -294,7 +294,7 @@
@try {
[fake_password_serializer_bridge executeHandler];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_OCMOCK_VERIFY(password_exporter_delegate_);
} @catch (NSException* exception) {
// The exception is raised when
@@ -321,7 +321,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
[password_exporter_ cancelExport];
EXPECT_EQ(ExportState::CANCELLING, password_exporter_.exportState);
@@ -352,7 +352,7 @@
[password_exporter_ startExportFlow:CreatePasswordList()];
// Wait for all asynchronous tasks to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
[password_exporter_ cancelExport];
EXPECT_EQ(ExportState::CANCELLING, password_exporter_.exportState);
diff --git a/ios/chrome/browser/ui/settings/settings_root_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/settings_root_table_view_controller_unittest.mm
index 4bf4f39..76d9ad3 100644
--- a/ios/chrome/browser/ui/settings/settings_root_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/settings_root_table_view_controller_unittest.mm
@@ -39,7 +39,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
};
diff --git a/ios/chrome/browser/ui/settings/translate_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/translate_table_view_controller_unittest.mm
index de0270b..b9107118 100644
--- a/ios/chrome/browser/ui/settings/translate_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/translate_table_view_controller_unittest.mm
@@ -42,8 +42,7 @@
class TranslateTableViewControllerTest : public ChromeTableViewControllerTest {
protected:
TranslateTableViewControllerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
ChromeTableViewControllerTest::SetUp();
@@ -67,7 +66,7 @@
return factory.Create(registry.get());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefService> pref_service_;
};
diff --git a/ios/chrome/browser/ui/settings/voice_search_table_view_controller_unittest.mm b/ios/chrome/browser/ui/settings/voice_search_table_view_controller_unittest.mm
index 41771d7..888e62f6 100644
--- a/ios/chrome/browser/ui/settings/voice_search_table_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/settings/voice_search_table_view_controller_unittest.mm
@@ -34,8 +34,7 @@
: public ChromeTableViewControllerTest {
protected:
VoiceSearchTableViewControllerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
ChromeTableViewControllerTest::SetUp();
@@ -60,7 +59,7 @@
cellForRowAtIndexPath:[NSIndexPath indexPathForItem:0 inSection:0]]);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefService> pref_service_;
};
diff --git a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller_unittest.mm b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller_unittest.mm
index 73acdfd..9514b02 100644
--- a/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller_unittest.mm
+++ b/ios/chrome/browser/ui/toolbar/adaptive_toolbar_view_controller_unittest.mm
@@ -41,10 +41,9 @@
class AdaptiveToolbarViewControllerTest : public PlatformTest {
protected:
AdaptiveToolbarViewControllerTest()
- : scopedTaskEnvironment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : TaskEnvironment_(base::test::TaskEnvironment::MainThreadType::UI) {}
- base::test::ScopedTaskEnvironment scopedTaskEnvironment_;
+ base::test::TaskEnvironment TaskEnvironment_;
};
TEST_F(AdaptiveToolbarViewControllerTest, DetectForceTouch) {
diff --git a/ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm b/ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm
index 07e26460..f4e51b2 100644
--- a/ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm
+++ b/ios/chrome/browser/url_loading/image_search_param_generator_unittest.mm
@@ -28,7 +28,7 @@
chrome_browser_state_ = test_cbs_builder.Build();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
};
diff --git a/ios/chrome/browser/web/chrome_web_client_unittest.mm b/ios/chrome/browser/web/chrome_web_client_unittest.mm
index b0b5226..4d9fb92 100644
--- a/ios/chrome/browser/web/chrome_web_client_unittest.mm
+++ b/ios/chrome/browser/web/chrome_web_client_unittest.mm
@@ -61,7 +61,7 @@
ios::ChromeBrowserState* browser_state() { return browser_state_.get(); }
private:
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
std::unique_ptr<ios::ChromeBrowserState> browser_state_;
DISALLOW_COPY_AND_ASSIGN(ChromeWebClientTest);
diff --git a/ios/chrome/browser/web/sad_tab_tab_helper_unittest.mm b/ios/chrome/browser/web/sad_tab_tab_helper_unittest.mm
index ddea3cc..31ef9ee 100644
--- a/ios/chrome/browser/web/sad_tab_tab_helper_unittest.mm
+++ b/ios/chrome/browser/web/sad_tab_tab_helper_unittest.mm
@@ -98,7 +98,7 @@
~SadTabTabHelperTest() override { [application_ stopMocking]; }
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
ScopedKeyWindow scoped_key_window_;
UIView* web_state_view_;
std::unique_ptr<ios::ChromeBrowserState> browser_state_;
diff --git a/ios/components/io_thread/ios_io_thread_unittest.mm b/ios/components/io_thread/ios_io_thread_unittest.mm
index 3915f21..117e189f 100644
--- a/ios/components/io_thread/ios_io_thread_unittest.mm
+++ b/ios/components/io_thread/ios_io_thread_unittest.mm
@@ -46,7 +46,7 @@
web::WebThreadImpl::CreateTaskExecutor();
ui_thread_ = std::make_unique<web::TestWebThread>(
- web::WebThread::UI, scoped_task_environment_.GetMainThreadTaskRunner());
+ web::WebThread::UI, task_environment_.GetMainThreadTaskRunner());
}
~IOSIOThreadTest() override {
@@ -54,7 +54,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
web::ScopedTestingWebClient web_client_;
std::unique_ptr<web::TestWebThread> ui_thread_;
};
diff --git a/ios/net/cookies/cookie_store_ios_persistent_unittest.mm b/ios/net/cookies/cookie_store_ios_persistent_unittest.mm
index 3b0a543..85ea1e7 100644
--- a/ios/net/cookies/cookie_store_ios_persistent_unittest.mm
+++ b/ios/net/cookies/cookie_store_ios_persistent_unittest.mm
@@ -53,7 +53,7 @@
static const int enforces_prefixes = true;
static const bool enforce_strict_secure = false;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
INSTANTIATE_TYPED_TEST_SUITE_P(PersistentCookieStoreIOS,
@@ -110,7 +110,7 @@
const GURL kTestCookieURL;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ScopedTestingCookieStoreIOSClient scoped_cookie_store_ios_client_;
scoped_refptr<net::TestPersistentCookieStore> backend_;
std::unique_ptr<net::CookieStoreIOS> store_;
diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm
index 357f3d5..e1c8121 100644
--- a/ios/net/cookies/cookie_store_ios_unittest.mm
+++ b/ios/net/cookies/cookie_store_ios_unittest.mm
@@ -69,7 +69,7 @@
static const bool has_exact_change_ordering = false;
static const int creation_time_granularity_in_ms = 1000;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
INSTANTIATE_TYPED_TEST_SUITE_P(CookieStoreIOS,
@@ -196,7 +196,7 @@
const GURL kTestCookieURLFoo;
const GURL kTestCookieURLBarBar;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ScopedTestingCookieStoreIOSClient scoped_cookie_store_ios_client_;
scoped_refptr<TestPersistentCookieStore> backend_;
// |system_store_| will point to the NSHTTPSystemCookieStore object owned by
diff --git a/ios/net/cookies/ns_http_system_cookie_store_unittest.mm b/ios/net/cookies/ns_http_system_cookie_store_unittest.mm
index 5297239..5d7e5c2 100644
--- a/ios/net/cookies/ns_http_system_cookie_store_unittest.mm
+++ b/ios/net/cookies/ns_http_system_cookie_store_unittest.mm
@@ -55,7 +55,7 @@
SystemCookieStore* GetCookieStore() { return store_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
ScopedTestingCookieStoreIOSClient scoped_cookie_store_ios_client_;
NSHTTPCookieStorage* shared_store_;
std::unique_ptr<net::NSHTTPSystemCookieStore> store_;
diff --git a/ios/net/protocol_handler_util_unittest.mm b/ios/net/protocol_handler_util_unittest.mm
index fa2d5df..c604ec6 100644
--- a/ios/net/protocol_handler_util_unittest.mm
+++ b/ios/net/protocol_handler_util_unittest.mm
@@ -154,7 +154,7 @@
void OnReadCompleted(URLRequest* request, int bytes_read) override {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
URLRequestJobFactoryImpl job_factory_;
std::unique_ptr<URLRequestContext> request_context_;
};
diff --git a/ios/web/browsing_data/browsing_data_remover_unittest.mm b/ios/web/browsing_data/browsing_data_remover_unittest.mm
index 1f6c17ed..d174d98 100644
--- a/ios/web/browsing_data/browsing_data_remover_unittest.mm
+++ b/ios/web/browsing_data/browsing_data_remover_unittest.mm
@@ -112,7 +112,7 @@
return BrowsingDataRemover::FromBrowserState(&browser_state_);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestBrowserState browser_state_;
};
diff --git a/ios/web/public/test/test_web_thread_bundle.h b/ios/web/public/test/test_web_thread_bundle.h
index 1dc8ab7..5b95bf9 100644
--- a/ios/web/public/test/test_web_thread_bundle.h
+++ b/ios/web/public/test/test_web_thread_bundle.h
@@ -41,7 +41,7 @@
class TestWebThread;
-class TestWebThreadBundle : public base::test::ScopedTaskEnvironment {
+class TestWebThreadBundle : public base::test::TaskEnvironment {
public:
// Used to specify the type of MessageLoop that backs the UI thread, and
// which of the named WebThreads should be backed by a real
diff --git a/ios/web/test/test_web_thread_bundle.cc b/ios/web/test/test_web_thread_bundle.cc
index ea75c8d..b938b9a 100644
--- a/ios/web/test/test_web_thread_bundle.cc
+++ b/ios/web/test/test_web_thread_bundle.cc
@@ -13,8 +13,8 @@
namespace web {
TestWebThreadBundle::TestWebThreadBundle(int options)
- : base::test::ScopedTaskEnvironment(
- options == IO_MAINLOOP ? MainThreadType::IO : MainThreadType::UI) {
+ : base::test::TaskEnvironment(options == IO_MAINLOOP ? MainThreadType::IO
+ : MainThreadType::UI) {
Init(options);
}
diff --git a/ios/web/webui/url_fetcher_block_adapter_unittest.mm b/ios/web/webui/url_fetcher_block_adapter_unittest.mm
index 64d77a3..a9830c2 100644
--- a/ios/web/webui/url_fetcher_block_adapter_unittest.mm
+++ b/ios/web/webui/url_fetcher_block_adapter_unittest.mm
@@ -28,11 +28,10 @@
class URLFetcherBlockAdapterTest : public PlatformTest {
protected:
URLFetcherBlockAdapterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
// Required for base::MessageLoopCurrent::Get().
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Tests that URLFetcherBlockAdapter calls its completion handler with the
diff --git a/ios/web_view/internal/cwv_download_task_unittest.mm b/ios/web_view/internal/cwv_download_task_unittest.mm
index aa5572fa..26b3b9d3 100644
--- a/ios/web_view/internal/cwv_download_task_unittest.mm
+++ b/ios/web_view/internal/cwv_download_task_unittest.mm
@@ -45,7 +45,7 @@
protected:
std::string valid_local_file_path_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
web::FakeDownloadTask* fake_internal_task_ = nullptr;
id<CWVDownloadTaskDelegate> mock_delegate_ = nil;
CWVDownloadTask* cwv_task_ = nil;
@@ -53,7 +53,7 @@
// Waits until fake_internal_task_->Start() is called.
bool WaitUntilTaskStarts() WARN_UNUSED_RESULT {
return WaitUntilConditionOrTimeout(kWaitForFileOperationTimeout, ^{
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return fake_internal_task_->GetState() ==
web::DownloadTask::State::kInProgress;
});
@@ -67,7 +67,7 @@
error_code = block_error_code;
}));
return WaitUntilConditionOrTimeout(kWaitForFileOperationTimeout, ^{
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return error_code == net::OK;
});
}
@@ -151,7 +151,7 @@
[cwv_task_ startDownloadToLocalFileAtPath:path];
EXPECT_TRUE(WaitUntilConditionOrTimeout(kWaitForFileOperationTimeout, ^{
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return did_finish_called;
}));
}
diff --git a/ipc/ipc_channel_mojo_unittest.cc b/ipc/ipc_channel_mojo_unittest.cc
index abfe788..6ab79d3 100644
--- a/ipc/ipc_channel_mojo_unittest.cc
+++ b/ipc/ipc_channel_mojo_unittest.cc
@@ -949,7 +949,7 @@
IPC::ChannelProxy* proxy() { return runner_->proxy(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ChannelProxyRunner> runner_;
};
diff --git a/ipc/ipc_cpu_perftest.cc b/ipc/ipc_cpu_perftest.cc
index 4c5d22c..36fba94d 100644
--- a/ipc/ipc_cpu_perftest.cc
+++ b/ipc/ipc_cpu_perftest.cc
@@ -394,7 +394,7 @@
};
DEFINE_TEST_CLIENT_WITH_PIPE(PingPongClient, MojoSteadyPingPongTest, h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
return RunPingPongClient(h);
}
@@ -402,14 +402,14 @@
// instead of raw IPC::Messages.
TEST_F(MojoSteadyPingPongTest, AsyncPingPong) {
RunTestClient("PingPongClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunPingPongServer(h, "Mojo_CPU_Async", false);
});
}
TEST_F(MojoSteadyPingPongTest, SyncPingPong) {
RunTestClient("PingPongClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunPingPongServer(h, "Mojo_CPU_Sync", true);
});
}
diff --git a/ipc/ipc_mojo_bootstrap_unittest.cc b/ipc/ipc_mojo_bootstrap_unittest.cc
index 12e6c1d..8c4b1962 100644
--- a/ipc/ipc_mojo_bootstrap_unittest.cc
+++ b/ipc/ipc_mojo_bootstrap_unittest.cc
@@ -107,7 +107,7 @@
};
TEST_F(IPCMojoBootstrapTest, Connect) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
Connection connection(
IPC::MojoBootstrap::Create(
helper_.StartChild("IPCMojoBootstrapTestClient"),
@@ -132,7 +132,7 @@
MULTIPROCESS_TEST_MAIN_WITH_SETUP(
IPCMojoBootstrapTestClientTestChildMain,
::mojo::core::test::MultiprocessTestHelper::ChildSetup) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
Connection connection(
IPC::MojoBootstrap::Create(
std::move(mojo::core::test::MultiprocessTestHelper::primordial_pipe),
@@ -153,7 +153,7 @@
}
TEST_F(IPCMojoBootstrapTest, ReceiveEmptyMessage) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
Connection connection(
IPC::MojoBootstrap::Create(
helper_.StartChild("IPCMojoBootstrapTestEmptyMessage"),
@@ -180,7 +180,7 @@
MULTIPROCESS_TEST_MAIN_WITH_SETUP(
IPCMojoBootstrapTestEmptyMessageTestChildMain,
::mojo::core::test::MultiprocessTestHelper::ChildSetup) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
Connection connection(
IPC::MojoBootstrap::Create(
std::move(mojo::core::test::MultiprocessTestHelper::primordial_pipe),
diff --git a/ipc/ipc_mojo_perftest.cc b/ipc/ipc_mojo_perftest.cc
index e1f2a4a..215a0ff 100644
--- a/ipc/ipc_mojo_perftest.cc
+++ b/ipc/ipc_mojo_perftest.cc
@@ -536,7 +536,7 @@
DEFINE_TEST_CLIENT_WITH_PIPE(InterfacePassingClient,
MojoInterfacePassingPerfTest,
h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
return RunInterfacePassingClient(h);
}
@@ -571,7 +571,7 @@
InProcessPerfTest<MojoInterfacePassingPerfTest>;
DEFINE_TEST_CLIENT_WITH_PIPE(PingPongClient, MojoInterfacePerfTest, h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
return RunPingPongClient(h);
}
@@ -579,7 +579,7 @@
// raw IPC::Messages.
TEST_F(MojoInterfacePerfTest, MultiprocessPingPong) {
RunTestClient("PingPongClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunPingPongServer(h, "Multiprocess");
});
}
@@ -587,21 +587,21 @@
TEST_F(MojoInterfacePerfTest, MultiprocessSyncPing) {
sync_ = true;
RunTestClient("PingPongClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunPingPongServer(h, "MultiprocessSync");
});
}
TEST_F(MojoInterfacePassingPerfTest, MultiprocessInterfacePassing) {
RunTestClient("InterfacePassingClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunInterfacePassingServer(h, "InterfacePassing", false /* associated */);
});
}
TEST_F(MojoInterfacePassingPerfTest, MultiprocessAssociatedInterfacePassing) {
RunTestClient("InterfacePassingClient", [&](MojoHandle h) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunInterfacePassingServer(h, "AssociatedInterfacePassing",
true /* associated*/);
});
@@ -618,7 +618,7 @@
FROM_HERE,
base::BindOnce(base::IgnoreResult(&RunPingPongClient), client_handle));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunPingPongServer(server_handle, "SingleProcess");
}
@@ -626,7 +626,7 @@
MojoHandle server_handle, client_handle;
CreateMessagePipe(&server_handle, &client_handle);
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
mojo::MessagePipeHandle mp_handle(client_handle);
mojo::ScopedMessagePipeHandle scoped_mp(mp_handle);
LockThreadAffinity thread_locker(kSharedCore);
@@ -650,7 +650,7 @@
FROM_HERE, base::BindOnce(base::IgnoreResult(&RunInterfacePassingClient),
client_handle));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunInterfacePassingServer(server_handle, "SingleProcess",
false /* associated */);
}
@@ -666,7 +666,7 @@
FROM_HERE, base::BindOnce(base::IgnoreResult(&RunInterfacePassingClient),
client_handle));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
RunInterfacePassingServer(server_handle, "SingleProcess",
true /* associated */);
}
@@ -675,7 +675,7 @@
MojoHandle server_handle, client_handle;
CreateMessagePipe(&server_handle, &client_handle);
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
mojo::MessagePipeHandle mp_handle(client_handle);
mojo::ScopedMessagePipeHandle scoped_mp(mp_handle);
LockThreadAffinity thread_locker(kSharedCore);
@@ -690,7 +690,7 @@
MojoHandle server_handle, client_handle;
CreateMessagePipe(&server_handle, &client_handle);
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
mojo::MessagePipeHandle mp_handle(client_handle);
mojo::ScopedMessagePipeHandle scoped_mp(mp_handle);
LockThreadAffinity thread_locker(kSharedCore);
@@ -729,7 +729,7 @@
}
void Ping(const std::string& value) {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&CallbackPerfTest::OnPong,
base::Unretained(this), value));
}
@@ -836,7 +836,7 @@
private:
base::Thread client_thread_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
int message_count_;
int count_down_;
std::string payload_;
diff --git a/ipc/ipc_sync_channel_unittest.cc b/ipc/ipc_sync_channel_unittest.cc
index 6a11e14..c1c2ded 100644
--- a/ipc/ipc_sync_channel_unittest.cc
+++ b/ipc/ipc_sync_channel_unittest.cc
@@ -291,7 +291,7 @@
class IPCSyncChannelTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
//------------------------------------------------------------------------------
diff --git a/ipc/ipc_test_base.h b/ipc/ipc_test_base.h
index b8505be3..9c40778 100644
--- a/ipc/ipc_test_base.h
+++ b/ipc/ipc_test_base.h
@@ -75,8 +75,8 @@
IPC::Channel* channel() const { return channel_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
mojo::ScopedMessagePipeHandle handle_;
std::unique_ptr<IPC::Channel> channel_;
};
diff --git a/jingle/glue/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc
index 89ea3fa..bf6c282 100644
--- a/jingle/glue/fake_ssl_client_socket_unittest.cc
+++ b/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -275,7 +275,7 @@
}
// MockTCPClientSocket needs a message loop.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::MockClientSocketFactory mock_client_socket_factory_;
std::unique_ptr<net::StaticSocketDataProvider> static_socket_data_provider_;
diff --git a/jingle/glue/network_service_async_socket_unittest.cc b/jingle/glue/network_service_async_socket_unittest.cc
index a4fe932..2f82c9c 100644
--- a/jingle/glue/network_service_async_socket_unittest.cc
+++ b/jingle/glue/network_service_async_socket_unittest.cc
@@ -553,7 +553,7 @@
}
// Need a message loop for both the socket and Mojo.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
AsyncSocketDataProvider async_socket_data_provider_;
net::SSLSocketDataProvider ssl_socket_data_provider_;
diff --git a/jingle/glue/task_pump_unittest.cc b/jingle/glue/task_pump_unittest.cc
index 5b00b856..1e250e9 100644
--- a/jingle/glue/task_pump_unittest.cc
+++ b/jingle/glue/task_pump_unittest.cc
@@ -17,7 +17,7 @@
class TaskPumpTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(TaskPumpTest, Basic) {
diff --git a/jingle/glue/thread_wrapper_unittest.cc b/jingle/glue/thread_wrapper_unittest.cc
index 5653e2a9..938064e 100644
--- a/jingle/glue/thread_wrapper_unittest.cc
+++ b/jingle/glue/thread_wrapper_unittest.cc
@@ -90,7 +90,7 @@
}
// ThreadWrapper destroyes itself when |message_loop_| is destroyed.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
rtc::Thread* thread_;
MockMessageHandler handler1_;
MockMessageHandler handler2_;
@@ -156,7 +156,7 @@
.WillOnce(DeleteMessageData());
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(kMaxTestDelay));
run_loop.Run();
@@ -212,7 +212,7 @@
.WillOnce(DeleteMessageData());
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(kMaxTestDelay));
run_loop.Run();
diff --git a/jingle/notifier/base/weak_xmpp_client_unittest.cc b/jingle/notifier/base/weak_xmpp_client_unittest.cc
index fa8a2b4..9403eb9 100644
--- a/jingle/notifier/base/weak_xmpp_client_unittest.cc
+++ b/jingle/notifier/base/weak_xmpp_client_unittest.cc
@@ -61,7 +61,7 @@
}
// Needed by TaskPump.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<jingle_glue::TaskPump> task_pump_;
MockXmppDelegate mock_xmpp_delegate_;
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc
index 77dbffe..5cebd09 100644
--- a/jingle/notifier/base/xmpp_connection_unittest.cc
+++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -79,7 +79,7 @@
: mock_pre_xmpp_auth_(new MockPreXmppAuth()),
net_config_helper_(
base::MakeRefCounted<net::TestURLRequestContextGetter>(
- scoped_task_environment_.GetMainThreadTaskRunner())) {
+ task_environment_.GetMainThreadTaskRunner())) {
// GTest death tests by default execute in a fork()ed but not exec()ed
// process. On macOS, a CoreFoundation-backed MessageLoop will exit with a
// __THE_PROCESS_HAS_FORKED_AND_YOU_CANNOT_USE_THIS_COREFOUNDATION_FUNCTIONALITY___YOU_MUST_EXEC__
@@ -95,7 +95,7 @@
}
// Needed by XmppConnection.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockXmppConnectionDelegate mock_xmpp_connection_delegate_;
std::unique_ptr<MockPreXmppAuth> mock_pre_xmpp_auth_;
jingle_glue::NetworkServiceConfigTestUtil net_config_helper_;
diff --git a/jingle/notifier/communicator/single_login_attempt_unittest.cc b/jingle/notifier/communicator/single_login_attempt_unittest.cc
index 00d63ff..49ab52c1 100644
--- a/jingle/notifier/communicator/single_login_attempt_unittest.cc
+++ b/jingle/notifier/communicator/single_login_attempt_unittest.cc
@@ -111,7 +111,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
jingle_glue::NetworkServiceConfigTestUtil net_config_helper_;
const LoginSettings login_settings_;
diff --git a/jingle/notifier/listener/non_blocking_push_client_unittest.cc b/jingle/notifier/listener/non_blocking_push_client_unittest.cc
index 1ed9b17..68ea0fb 100644
--- a/jingle/notifier/listener/non_blocking_push_client_unittest.cc
+++ b/jingle/notifier/listener/non_blocking_push_client_unittest.cc
@@ -60,7 +60,7 @@
return std::unique_ptr<PushClient>(fake_push_client_);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakePushClientObserver fake_observer_;
std::unique_ptr<NonBlockingPushClient> push_client_;
// Owned by |push_client_|.
diff --git a/jingle/notifier/listener/push_client_unittest.cc b/jingle/notifier/listener/push_client_unittest.cc
index 2cccfc9..ee07e92 100644
--- a/jingle/notifier/listener/push_client_unittest.cc
+++ b/jingle/notifier/listener/push_client_unittest.cc
@@ -27,15 +27,15 @@
PushClientTest()
: net_config_helper_(
base::MakeRefCounted<net::TestURLRequestContextGetter>(
- scoped_task_environment_.GetMainThreadTaskRunner())) {
+ task_environment_.GetMainThreadTaskRunner())) {
net_config_helper_.FillInNetworkConfig(¬ifier_options_.network_config);
}
~PushClientTest() override {}
// The sockets created by the XMPP code expect an IO loop.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
jingle_glue::NetworkServiceConfigTestUtil net_config_helper_;
NotifierOptions notifier_options_;
};
diff --git a/jingle/notifier/listener/xmpp_push_client_unittest.cc b/jingle/notifier/listener/xmpp_push_client_unittest.cc
index e66f5786..ce023483 100644
--- a/jingle/notifier/listener/xmpp_push_client_unittest.cc
+++ b/jingle/notifier/listener/xmpp_push_client_unittest.cc
@@ -38,7 +38,7 @@
XmppPushClientTest()
: net_config_helper_(
base::MakeRefCounted<net::TestURLRequestContextGetter>(
- scoped_task_environment_.GetMainThreadTaskRunner())) {
+ task_environment_.GetMainThreadTaskRunner())) {
net_config_helper_.FillInNetworkConfig(¬ifier_options_.network_config);
}
@@ -57,8 +57,8 @@
}
// The sockets created by the XMPP code expect an IO loop.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
jingle_glue::NetworkServiceConfigTestUtil net_config_helper_;
NotifierOptions notifier_options_;
diff --git a/media/audio/alive_checker_unittest.cc b/media/audio/alive_checker_unittest.cc
index ac2bf73..212ee54 100644
--- a/media/audio/alive_checker_unittest.cc
+++ b/media/audio/alive_checker_unittest.cc
@@ -159,7 +159,7 @@
}
// The test task environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The thread the checker is run on.
base::Thread alive_checker_thread_;
diff --git a/media/audio/audio_debug_file_writer_unittest.cc b/media/audio/audio_debug_file_writer_unittest.cc
index 4d49869..e777622 100644
--- a/media/audio/audio_debug_file_writer_unittest.cc
+++ b/media/audio/audio_debug_file_writer_unittest.cc
@@ -50,10 +50,9 @@
: public testing::TestWithParam<AudioDebugFileWriterTestData> {
public:
explicit AudioDebugFileWriterTest(
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode execution_mode)
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- execution_mode),
+ base::test::TaskEnvironment::ThreadPoolExecutionMode execution_mode)
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ execution_mode),
params_(AudioParameters::Format::AUDIO_PCM_LINEAR,
std::get<0>(GetParam()),
std::get<1>(GetParam()),
@@ -67,8 +66,7 @@
}
AudioDebugFileWriterTest()
: AudioDebugFileWriterTest(
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::ASYNC) {
- }
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::ASYNC) {}
protected:
virtual ~AudioDebugFileWriterTest() = default;
@@ -192,7 +190,7 @@
debug_writer_->Stop();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
VerifyRecording(file_path);
@@ -206,7 +204,7 @@
protected:
// The test task environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Writer under test.
std::unique_ptr<AudioDebugFileWriter> debug_writer_;
@@ -232,8 +230,8 @@
class AudioDebugFileWriterSingleThreadTest : public AudioDebugFileWriterTest {
public:
AudioDebugFileWriterSingleThreadTest()
- : AudioDebugFileWriterTest(base::test::ScopedTaskEnvironment::
- ThreadPoolExecutionMode::QUEUED) {}
+ : AudioDebugFileWriterTest(
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
};
TEST_P(AudioDebugFileWriterTest, WaveRecordingTest) {
@@ -256,7 +254,7 @@
debug_writer_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
VerifyRecording(file_path);
diff --git a/media/audio/audio_debug_recording_helper_unittest.cc b/media/audio/audio_debug_recording_helper_unittest.cc
index 9bd581d..816fe3b 100644
--- a/media/audio/audio_debug_recording_helper_unittest.cc
+++ b/media/audio/audio_debug_recording_helper_unittest.cc
@@ -112,7 +112,7 @@
const AudioParameters& params,
base::OnceClosure on_destruction_closure) {
return std::make_unique<AudioDebugRecordingHelperUnderTest>(
- params, scoped_task_environment_.GetMainThreadTaskRunner(),
+ params, task_environment_.GetMainThreadTaskRunner(),
std::move(on_destruction_closure));
}
@@ -146,7 +146,7 @@
const uint32_t id_ = 1;
// The test task environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(AudioDebugRecordingHelperTest);
diff --git a/media/audio/audio_debug_recording_manager_unittest.cc b/media/audio/audio_debug_recording_manager_unittest.cc
index 014491b5..7f0156ad 100644
--- a/media/audio/audio_debug_recording_manager_unittest.cc
+++ b/media/audio/audio_debug_recording_manager_unittest.cc
@@ -114,7 +114,7 @@
class AudioDebugRecordingManagerTest : public ::testing::Test {
public:
AudioDebugRecordingManagerTest()
- : manager_(scoped_task_environment_.GetMainThreadTaskRunner()) {}
+ : manager_(task_environment_.GetMainThreadTaskRunner()) {}
~AudioDebugRecordingManagerTest() override = default;
@@ -127,7 +127,7 @@
protected:
// The test task environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
AudioDebugRecordingManagerUnderTest manager_;
diff --git a/media/audio/audio_debug_recording_session_impl_unittest.cc b/media/audio/audio_debug_recording_session_impl_unittest.cc
index 4706798..4be916a 100644
--- a/media/audio/audio_debug_recording_session_impl_unittest.cc
+++ b/media/audio/audio_debug_recording_session_impl_unittest.cc
@@ -125,7 +125,7 @@
CreateDebugRecordingSession();
// Wait for files to be created.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Check that expected files were created.
base::FilePath input_recording_filename(GetFileName(kInput, kId));
diff --git a/media/audio/audio_debug_recording_test.h b/media/audio/audio_debug_recording_test.h
index 4191b93..6c5aaad 100644
--- a/media/audio/audio_debug_recording_test.h
+++ b/media/audio/audio_debug_recording_test.h
@@ -28,7 +28,7 @@
void ShutdownAudioManager();
void InitializeAudioDebugRecordingManager();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockAudioManager> mock_audio_manager_;
MockAudioDebugRecordingManager* mock_debug_recording_manager_;
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index 00a3b5ab..6de9cc8 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -144,7 +144,7 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Parameterize tests to run AudioInputController either on audio thread
// (synchronously), or on a different thread (non-blocking).
diff --git a/media/audio/audio_input_device_unittest.cc b/media/audio/audio_input_device_unittest.cc
index 01fa2ad..52549ac 100644
--- a/media/audio/audio_input_device_unittest.cc
+++ b/media/audio/audio_input_device_unittest.cc
@@ -117,7 +117,7 @@
shared_memory.region.Duplicate();
ASSERT_TRUE(duplicated_shared_memory_region.IsValid());
- base::test::ScopedTaskEnvironment ste;
+ base::test::TaskEnvironment ste;
MockCaptureCallback callback;
MockAudioInputIPC* input_ipc = new MockAudioInputIPC();
scoped_refptr<AudioInputDevice> device(new AudioInputDevice(
diff --git a/media/audio/audio_input_sync_writer_unittest.cc b/media/audio/audio_input_sync_writer_unittest.cc
index c887c33..4055ff1 100644
--- a/media/audio/audio_input_sync_writer_unittest.cc
+++ b/media/audio/audio_input_sync_writer_unittest.cc
@@ -155,7 +155,7 @@
using MockLogger =
base::MockCallback<base::RepeatingCallback<void(const std::string&)>>;
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
MockLogger mock_logger_;
std::unique_ptr<AudioInputSyncWriter> writer_;
MockCancelableSyncSocket* socket_;
diff --git a/media/audio/audio_low_latency_input_output_unittest.cc b/media/audio/audio_low_latency_input_output_unittest.cc
index 4ed02ecc..bd566c1 100644
--- a/media/audio/audio_low_latency_input_output_unittest.cc
+++ b/media/audio/audio_low_latency_input_output_unittest.cc
@@ -87,8 +87,8 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<AudioManager> audio_manager_;
DISALLOW_COPY_AND_ASSIGN(AudioLowLatencyInputOutputTest);
diff --git a/media/audio/audio_output_device_unittest.cc b/media/audio/audio_output_device_unittest.cc
index e837992..7cad3bb 100644
--- a/media/audio/audio_output_device_unittest.cc
+++ b/media/audio/audio_output_device_unittest.cc
@@ -109,8 +109,8 @@
MOCK_METHOD1(OnDeviceInfoReceived, void(OutputDeviceInfo));
protected:
- base::test::ScopedTaskEnvironment task_env_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_env_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
AudioParameters default_audio_parameters_;
StrictMock<MockRenderCallback> callback_;
MockAudioOutputIPC* audio_output_ipc_; // owned by audio_device_
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index e4ba36f..e84aa7d 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -488,7 +488,7 @@
proxy->Close();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockAudioManager manager_;
std::unique_ptr<AudioOutputDispatcherImpl> dispatcher_impl_;
MockAudioSourceCallback callback_;
@@ -511,7 +511,7 @@
void OnStart() override {
// Let Start() run for a bit.
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(kStartRunTimeMs));
run_loop.Run();
@@ -824,7 +824,7 @@
// Once all proxies have been closed, AudioOutputResampler will start the
// reinitialization timer and execute it after the close delay elapses.
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(2 * kTestCloseDelayMs));
run_loop.Run();
diff --git a/media/audio/audio_sync_reader_unittest.cc b/media/audio/audio_sync_reader_unittest.cc
index f92eaba5..14cd595 100644
--- a/media/audio/audio_sync_reader_unittest.cc
+++ b/media/audio/audio_sync_reader_unittest.cc
@@ -49,7 +49,7 @@
~AudioSyncReaderBitstreamTest() override {}
private:
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
};
TEST_P(AudioSyncReaderBitstreamTest, BitstreamBufferOverflow_DoesNotWriteOOB) {
diff --git a/media/audio/audio_system_impl_unittest.cc b/media/audio/audio_system_impl_unittest.cc
index cf85ff0..d5c2671 100644
--- a/media/audio/audio_system_impl_unittest.cc
+++ b/media/audio/audio_system_impl_unittest.cc
@@ -35,7 +35,7 @@
MockAudioManager* audio_manager() { return audio_manager_.get(); }
AudioSystem* audio_system() { return audio_system_.get(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockAudioManager> audio_manager_;
std::unique_ptr<AudioSystem> audio_system_;
// AudioSystemTester tester_;
diff --git a/media/audio/audio_thread_hang_monitor_unittest.cc b/media/audio/audio_thread_hang_monitor_unittest.cc
index ac5b3de6..65bccf9 100644
--- a/media/audio/audio_thread_hang_monitor_unittest.cc
+++ b/media/audio/audio_thread_hang_monitor_unittest.cc
@@ -38,13 +38,13 @@
class AudioThreadHangMonitorTest : public Test {
public:
AudioThreadHangMonitorTest()
- : task_env_(base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_env_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
histograms_(),
audio_thread_("Audio thread"),
hang_monitor_({nullptr, base::OnTaskRunnerDeleter(nullptr)}) {
CHECK(audio_thread_.Start());
// We must inject the main thread task runner as the hang monitor task
- // runner since ScopedTaskEnvironment::FastForwardBy only works for the main
+ // runner since TaskEnvironment::FastForwardBy only works for the main
// thread.
hang_monitor_ = AudioThreadHangMonitor::Create(
HangAction::kDoNothing, base::nullopt, task_env_.GetMockTickClock(),
@@ -87,7 +87,7 @@
MOCK_METHOD0(HangActionTerminate, void());
base::WaitableEvent event_;
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
base::HistogramTester histograms_;
base::Thread audio_thread_;
AudioThreadHangMonitor::Ptr hang_monitor_;
diff --git a/media/audio/mac/audio_device_listener_mac_unittest.cc b/media/audio/mac/audio_device_listener_mac_unittest.cc
index b222c593..93aa77c 100644
--- a/media/audio/mac/audio_device_listener_mac_unittest.cc
+++ b/media/audio/mac/audio_device_listener_mac_unittest.cc
@@ -25,7 +25,7 @@
AudioDeviceListenerMacTest() {
// It's important to create the device listener from the message loop in
// order to ensure we don't end up with unbalanced TaskObserver calls.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&AudioDeviceListenerMacTest::CreateDeviceListener,
base::Unretained(this)));
@@ -35,7 +35,7 @@
virtual ~AudioDeviceListenerMacTest() {
// It's important to destroy the device listener from the message loop in
// order to ensure we don't end up with unbalanced TaskObserver calls.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&AudioDeviceListenerMacTest::DestroyDeviceListener,
base::Unretained(this)));
@@ -98,7 +98,7 @@
MOCK_METHOD0(OnDeviceChange, void());
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AudioDeviceListenerMac> device_listener_;
DISALLOW_COPY_AND_ASSIGN(AudioDeviceListenerMacTest);
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index 6f46b9f..3707bf1 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -113,8 +113,7 @@
class MacAudioInputTest : public testing::Test {
protected:
MacAudioInputTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
audio_manager_(AudioManager::CreateForTesting(
std::make_unique<TestAudioThread>())) {
// Wait for the AudioManager to finish any initialization on the audio loop.
@@ -159,7 +158,7 @@
void OnLogMessage(const std::string& message) { log_message_ = message; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_;
std::string log_message_;
};
@@ -219,7 +218,7 @@
EXPECT_CALL(sink, OnData(NotNull(), _, _))
.Times(AtLeast(10))
.WillRepeatedly(CheckCountAndPostQuitTask(
- &count, 10, scoped_task_environment_.GetMainThreadTaskRunner(),
+ &count, 10, task_environment_.GetMainThreadTaskRunner(),
run_loop.QuitClosure()));
ais->Start(&sink);
run_loop.Run();
@@ -255,7 +254,7 @@
EXPECT_CALL(sink, OnData(NotNull(), _, _))
.Times(AtLeast(10))
.WillRepeatedly(CheckCountAndPostQuitTask(
- &count, 10, scoped_task_environment_.GetMainThreadTaskRunner(),
+ &count, 10, task_environment_.GetMainThreadTaskRunner(),
run_loop.QuitClosure()));
ais->Start(&sink);
run_loop.Run();
diff --git a/media/audio/power_observer_helper_unittest.cc b/media/audio/power_observer_helper_unittest.cc
index 5a1f0b4..4eafcbb 100644
--- a/media/audio/power_observer_helper_unittest.cc
+++ b/media/audio/power_observer_helper_unittest.cc
@@ -102,7 +102,7 @@
}
// The test task environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The thread the helper is run on.
base::Thread power_observer_helper_thread_;
diff --git a/media/audio/win/audio_low_latency_input_win_unittest.cc b/media/audio/win/audio_low_latency_input_win_unittest.cc
index 3f8b8fca..6b5248c 100644
--- a/media/audio/win/audio_low_latency_input_win_unittest.cc
+++ b/media/audio/win/audio_low_latency_input_win_unittest.cc
@@ -268,7 +268,7 @@
~WinAudioInputTest() override { audio_manager_->Shutdown(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_;
};
@@ -414,7 +414,7 @@
EXPECT_CALL(sink, OnData(NotNull(), _, _))
.Times(AtLeast(10))
.WillRepeatedly(CheckCountAndPostQuitTask(
- &count, 10, scoped_task_environment_.GetMainThreadTaskRunner(),
+ &count, 10, task_environment_.GetMainThreadTaskRunner(),
run_loop.QuitWhenIdleClosure()));
ais->Start(&sink);
run_loop.Run();
@@ -439,7 +439,7 @@
EXPECT_CALL(sink, OnData(NotNull(), _, _))
.Times(AtLeast(10))
.WillRepeatedly(CheckCountAndPostQuitTask(
- &count, 10, scoped_task_environment_.GetMainThreadTaskRunner(),
+ &count, 10, task_environment_.GetMainThreadTaskRunner(),
run_loop.QuitWhenIdleClosure()));
ais->Start(&sink);
run_loop.Run();
@@ -460,7 +460,7 @@
EXPECT_CALL(sink, OnData(NotNull(), _, _))
.Times(AtLeast(10))
.WillRepeatedly(CheckCountAndPostQuitTask(
- &count, 10, scoped_task_environment_.GetMainThreadTaskRunner(),
+ &count, 10, task_environment_.GetMainThreadTaskRunner(),
run_loop.QuitWhenIdleClosure()));
ais->Start(&sink);
run_loop.Run();
diff --git a/media/audio/win/audio_output_win_unittest.cc b/media/audio/win/audio_output_win_unittest.cc
index 07c7973..ef2fc6e 100644
--- a/media/audio/win/audio_output_win_unittest.cc
+++ b/media/audio/win/audio_output_win_unittest.cc
@@ -164,7 +164,7 @@
~WinAudioTest() override { audio_manager_->Shutdown(); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AudioManager> audio_manager_;
std::unique_ptr<AudioDeviceInfoAccessorForTests> audio_manager_device_info_;
};
diff --git a/media/base/android/media_drm_bridge_unittest.cc b/media/base/android/media_drm_bridge_unittest.cc
index 1083e5e..d19ddb0 100644
--- a/media/base/android/media_drm_bridge_unittest.cc
+++ b/media/base/android/media_drm_bridge_unittest.cc
@@ -116,7 +116,7 @@
return std::make_unique<ProvisionFetcherWrapper>(this);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(MediaDrmBridgeTest, IsKeySystemSupported_Widevine) {
diff --git a/media/base/android/media_player_bridge_unittest.cc b/media/base/android/media_player_bridge_unittest.cc
index 3766892d..7a513c4b 100644
--- a/media/base/android/media_player_bridge_unittest.cc
+++ b/media/base/android/media_player_bridge_unittest.cc
@@ -46,7 +46,7 @@
void SimulatePlaybackCompleted() { bridge_.OnPlaybackComplete(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockMediaPlayerBridgeClient> client_;
MediaPlayerBridge bridge_;
diff --git a/media/base/android/media_service_throttler_unittest.cc b/media/base/android/media_service_throttler_unittest.cc
index 5b6f5f9..c65ad7b 100644
--- a/media/base/android/media_service_throttler_unittest.cc
+++ b/media/base/android/media_service_throttler_unittest.cc
@@ -60,7 +60,7 @@
scoped_refptr<FakeSingleThreadTaskRunner> test_task_runner_;
// Necessary, or else base::ThreadTaskRunnerHandle::Get() fails.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(MediaServiceThrottlerTest);
diff --git a/media/base/audio_renderer_mixer_input_unittest.cc b/media/base/audio_renderer_mixer_input_unittest.cc
index e1606f9..a98d4681 100644
--- a/media/base/audio_renderer_mixer_input_unittest.cc
+++ b/media/base/audio_renderer_mixer_input_unittest.cc
@@ -53,7 +53,7 @@
mixer_input_ = new AudioRendererMixerInput(this, kRenderFrameId, device_id,
AudioLatency::LATENCY_PLAYBACK);
mixer_input_->GetOutputDeviceInfoAsync(base::DoNothing());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
AudioRendererMixer* GetMixer(int owner_id,
@@ -109,7 +109,7 @@
protected:
~AudioRendererMixerInputTest() override = default;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
AudioParameters audio_parameters_;
std::unique_ptr<AudioRendererMixer> mixers_[2];
scoped_refptr<AudioRendererMixerInput> mixer_input_;
@@ -166,7 +166,7 @@
mixer_input_->Stop();
mixer_input_->GetOutputDeviceInfoAsync(base::DoNothing());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
mixer_input_->Start();
mixer_input_->Stop();
}
@@ -178,7 +178,7 @@
mixer_input_->Stop();
mixer_input_->GetOutputDeviceInfoAsync(base::DoNothing());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
mixer_input_->Initialize(audio_parameters_, fake_callback_.get());
mixer_input_->Stop();
}
@@ -363,7 +363,7 @@
EXPECT_CALL(*this, OnDeviceInfoReceived(_))
.WillOnce(testing::SaveArg<0>(&info));
EXPECT_CALL(*this, SwitchCallbackCalled(OUTPUT_DEVICE_STATUS_OK));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kExpectedStatus, info.device_status());
EXPECT_EQ(kDefaultDeviceId, info.device_id());
}
@@ -394,7 +394,7 @@
constexpr auto kExpectedStatus = OUTPUT_DEVICE_STATUS_OK;
EXPECT_CALL(*this, OnDeviceInfoReceived(_))
.WillOnce(testing::SaveArg<0>(&info));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kExpectedStatus, info.device_status());
EXPECT_EQ(kAnotherDeviceId, info.device_id());
}
@@ -426,7 +426,7 @@
constexpr auto kExpectedStatus = OUTPUT_DEVICE_STATUS_OK;
EXPECT_CALL(*this, OnDeviceInfoReceived(_))
.WillOnce(testing::SaveArg<0>(&info));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kExpectedStatus, info.device_status());
EXPECT_EQ(kDefaultDeviceId, info.device_id());
}
diff --git a/media/base/audio_renderer_mixer_unittest.cc b/media/base/audio_renderer_mixer_unittest.cc
index 6cb998e..4866def 100644
--- a/media/base/audio_renderer_mixer_unittest.cc
+++ b/media/base/audio_renderer_mixer_unittest.cc
@@ -351,7 +351,7 @@
protected:
virtual ~AudioRendererMixerTest() = default;
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
scoped_refptr<MockAudioRendererSink> sink_;
std::unique_ptr<AudioRendererMixer> mixer_;
AudioRendererSink::RenderCallback* mixer_callback_;
diff --git a/media/base/bind_to_current_loop_unittest.cc b/media/base/bind_to_current_loop_unittest.cc
index 1a750bb..d826ae19 100644
--- a/media/base/bind_to_current_loop_unittest.cc
+++ b/media/base/bind_to_current_loop_unittest.cc
@@ -61,7 +61,7 @@
// on the message loop, not during the original Run.
class BindToCurrentLoopTest : public ::testing::Test {
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BindToCurrentLoopTest, RepeatingClosure) {
diff --git a/media/base/callback_registry_unittest.cc b/media/base/callback_registry_unittest.cc
index 6c1ff1e..202511d4 100644
--- a/media/base/callback_registry_unittest.cc
+++ b/media/base/callback_registry_unittest.cc
@@ -20,7 +20,7 @@
class CallbackRegistryTest : public testing::Test {
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(CallbackRegistryTest, RegisterWithNoParam) {
@@ -32,7 +32,7 @@
EXPECT_CALL(callback, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterWithOneParam) {
@@ -44,7 +44,7 @@
EXPECT_CALL(callback, Run(1));
registry.Notify(1);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterWithTwoParams) {
@@ -56,7 +56,7 @@
EXPECT_CALL(callback, Run(1, 2));
registry.Notify(1, 2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterWithMoveOnlyParam) {
@@ -69,7 +69,7 @@
EXPECT_CALL(callback, Run(_));
registry.Notify(std::make_unique<int>(1));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterWithPointerParam) {
@@ -81,7 +81,7 @@
EXPECT_CALL(callback, Run(IsNull()));
registry.Notify(nullptr);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterWithReferenceParam) {
@@ -94,7 +94,7 @@
int i = 1;
EXPECT_CALL(callback, Run(i));
registry.Notify(i);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterAfterNotify) {
@@ -106,7 +106,7 @@
EXPECT_CALL(callback_1, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::MockCallback<base::RepeatingClosure> callback_2;
auto registration_2 = registry.Register(callback_2.Get());
@@ -115,7 +115,7 @@
EXPECT_CALL(callback_1, Run());
EXPECT_CALL(callback_2, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, EmptyRegistry) {
@@ -136,16 +136,16 @@
EXPECT_CALL(callback_1, Run());
EXPECT_CALL(callback_2, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
registration_1.reset();
EXPECT_CALL(callback_2, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
registration_2.reset();
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(CallbackRegistryTest, RegisterDuringNotification) {
@@ -162,13 +162,13 @@
registration_2 = registry.Register(callback_2.Get());
}));
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(registration_2);
EXPECT_CALL(callback_1, Run());
EXPECT_CALL(callback_2, Run());
registry.Notify();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
} // namespace
diff --git a/media/base/fake_audio_worker_unittest.cc b/media/base/fake_audio_worker_unittest.cc
index 11569f08..6cffce0 100644
--- a/media/base/fake_audio_worker_unittest.cc
+++ b/media/base/fake_audio_worker_unittest.cc
@@ -34,8 +34,7 @@
public:
FakeAudioWorkerTest()
: params_(AudioParameters::AUDIO_FAKE, CHANNEL_LAYOUT_STEREO, 44100, 128),
- fake_worker_(scoped_task_environment_.GetMainThreadTaskRunner(),
- params_) {
+ fake_worker_(task_environment_.GetMainThreadTaskRunner(), params_) {
time_between_callbacks_ = base::TimeDelta::FromMicroseconds(
params_.frames_per_buffer() * base::Time::kMicrosecondsPerSecond /
static_cast<float>(params_.sample_rate()));
@@ -84,12 +83,12 @@
}
scoped_refptr<base::SingleThreadTaskRunner> TaskRunner() {
- return scoped_task_environment_.GetMainThreadTaskRunner();
+ return task_environment_.GetMainThreadTaskRunner();
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
AudioParameters params_;
FakeAudioWorker fake_worker_;
base::TimeDelta time_between_callbacks_;
@@ -111,10 +110,10 @@
// PostTaskAndReply because we want to end_test after run_on_audio_thread is
// finished. This is because RunOnAudioThread may post other tasks which
// should run before we end_test.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTaskAndReply(
+ task_environment_.GetMainThreadTaskRunner()->PostTaskAndReply(
FROM_HERE, std::move(run_on_audio_thread), std::move(end_test));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_THAT(callbacks_, SizeIs(1));
}
@@ -125,7 +124,7 @@
FROM_HERE,
base::BindOnce(&FakeAudioWorkerTest::TimeCallbacksOnAudioThread,
base::Unretained(this), kTestCallbacks));
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
EXPECT_THAT(callbacks_, SizeIs(Eq(kTestCallbacks)));
@@ -156,13 +155,13 @@
// Issuing a Stop() / Start() in the middle of the callback period should not
// trigger a callback.
- scoped_task_environment_.FastForwardBy(time_between_callbacks_ / 2);
+ task_environment_.FastForwardBy(time_between_callbacks_ / 2);
EXPECT_THAT(callbacks_, SizeIs(1));
TaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&FakeAudioWorkerTest::StopStartOnAudioThread,
base::Unretained(this)));
- scoped_task_environment_.FastForwardBy(time_between_callbacks_);
+ task_environment_.FastForwardBy(time_between_callbacks_);
// We expect 3 callbacks: First Start(), Second Start(), and one for the
// period. If the first callback was not cancelled, we would get 4 callbacks,
// two on the first period.
@@ -171,7 +170,7 @@
base::BindOnce(&FakeAudioWorkerTest::EndTest, base::Unretained(this)));
// EndTest() will ensure the proper number of callbacks have occurred.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
EXPECT_THAT(callbacks_, SizeIs(3));
}
diff --git a/media/base/fake_demuxer_stream_unittest.cc b/media/base/fake_demuxer_stream_unittest.cc
index b9a077a..ccd3d10 100644
--- a/media/base/fake_demuxer_stream_unittest.cc
+++ b/media/base/fake_demuxer_stream_unittest.cc
@@ -180,7 +180,7 @@
ReadAllBuffers(num_configs, num_buffers_in_one_config);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakeDemuxerStream> stream_;
DemuxerStream::Status status_;
diff --git a/media/base/fallback_video_decoder_unittest.cc b/media/base/fallback_video_decoder_unittest.cc
index e168be02..edb35a5 100644
--- a/media/base/fallback_video_decoder_unittest.cc
+++ b/media/base/fallback_video_decoder_unittest.cc
@@ -72,7 +72,7 @@
bool PreferredShouldSucceed() { return GetParam(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockVideoDecoder>* backup_decoder_;
StrictMock<MockVideoDecoder>* preferred_decoder_;
diff --git a/media/base/media_url_demuxer_unittest.cc b/media/base/media_url_demuxer_unittest.cc
index 56a8bb0..6021a7f3 100644
--- a/media/base/media_url_demuxer_unittest.cc
+++ b/media/base/media_url_demuxer_unittest.cc
@@ -42,7 +42,7 @@
std::unique_ptr<Demuxer> demuxer_;
// Necessary, or else base::ThreadTaskRunnerHandle::Get() fails.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(MediaUrlDemuxerTest);
diff --git a/media/base/null_video_sink_unittest.cc b/media/base/null_video_sink_unittest.cc
index ce91e58..903767a 100644
--- a/media/base/null_video_sink_unittest.cc
+++ b/media/base/null_video_sink_unittest.cc
@@ -37,7 +37,7 @@
std::unique_ptr<NullVideoSink> new_sink(new NullVideoSink(
clockless, interval,
base::Bind(&NullVideoSinkTest::FrameReceived, base::Unretained(this)),
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
new_sink->set_tick_clock_for_testing(&tick_clock_);
return new_sink;
}
@@ -62,7 +62,7 @@
MOCK_METHOD1(FrameReceived, void(scoped_refptr<VideoFrame>));
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::SimpleTestTickClock tick_clock_;
DISALLOW_COPY_AND_ASSIGN(NullVideoSinkTest);
diff --git a/media/base/pipeline_impl_unittest.cc b/media/base/pipeline_impl_unittest.cc
index bb015f5..6a12b93 100644
--- a/media/base/pipeline_impl_unittest.cc
+++ b/media/base/pipeline_impl_unittest.cc
@@ -103,10 +103,9 @@
};
PipelineImplTest()
- : pipeline_(
- new PipelineImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- &media_log_)),
+ : pipeline_(new PipelineImpl(task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ &media_log_)),
demuxer_(new StrictMock<MockDemuxer>()),
demuxer_host_(nullptr),
scoped_renderer_(new StrictMock<MockRenderer>()),
@@ -329,7 +328,7 @@
// Fixture members.
StrictMock<CallbackHelper> callbacks_;
base::SimpleTestTickClock test_tick_clock_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
std::unique_ptr<PipelineImpl> pipeline_;
@@ -718,10 +717,9 @@
// Invoked function OnError. This asserts that the pipeline does not enqueue
// non-teardown related tasks while tearing down.
-static void TestNoCallsAfterError(
- PipelineImpl* pipeline,
- base::test::ScopedTaskEnvironment* task_environment,
- PipelineStatus /* status */) {
+static void TestNoCallsAfterError(PipelineImpl* pipeline,
+ base::test::TaskEnvironment* task_environment,
+ PipelineStatus /* status */) {
CHECK(pipeline);
CHECK(task_environment);
@@ -746,8 +744,8 @@
StartPipelineAndExpect(PIPELINE_OK);
// Trigger additional requests on the pipeline during tear down from error.
- base::Callback<void(PipelineStatus)> cb = base::Bind(
- &TestNoCallsAfterError, pipeline_.get(), &scoped_task_environment_);
+ base::Callback<void(PipelineStatus)> cb =
+ base::Bind(&TestNoCallsAfterError, pipeline_.get(), &task_environment_);
ON_CALL(callbacks_, OnError(_)).WillByDefault(Invoke(CreateFunctor(cb)));
base::TimeDelta seek_time = base::TimeDelta::FromSeconds(5);
diff --git a/media/base/serial_runner_unittest.cc b/media/base/serial_runner_unittest.cc
index 354f8f8..fad2877 100644
--- a/media/base/serial_runner_unittest.cc
+++ b/media/base/serial_runner_unittest.cc
@@ -24,7 +24,7 @@
~SerialRunnerTest() override = default;
void RunSerialRunner() {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&SerialRunnerTest::StartRunnerInternal,
base::Unretained(this), bound_fns_));
base::RunLoop().RunUntilIdle();
@@ -119,7 +119,7 @@
void CancelSerialRunner(const PipelineStatusCB& status_cb) {
// Tasks run by |runner_| shouldn't reset it, hence we post a task to do so.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&SerialRunnerTest::ResetSerialRunner,
base::Unretained(this)));
status_cb.Run(PIPELINE_OK);
@@ -129,7 +129,7 @@
runner_.reset();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
SerialRunner::Queue bound_fns_;
std::unique_ptr<SerialRunner> runner_;
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc
index dd0df32..126bfc6 100644
--- a/media/base/text_renderer_unittest.cc
+++ b/media/base/text_renderer_unittest.cc
@@ -55,7 +55,7 @@
DCHECK(!text_renderer_);
text_renderer_.reset(new TextRenderer(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::Bind(&TextRendererTest::OnAddTextTrack, base::Unretained(this))));
text_renderer_->Initialize(
base::Bind(&TextRendererTest::OnEnd, base::Unretained(this)));
@@ -190,7 +190,7 @@
MOCK_METHOD0(OnPause, void());
MOCK_METHOD0(OnFlush, void());
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
typedef std::vector<std::unique_ptr<FakeTextTrackStream>> TextTrackStreams;
TextTrackStreams text_track_streams_;
@@ -206,7 +206,7 @@
TEST_F(TextRendererTest, CreateTextRendererNoInit) {
text_renderer_.reset(new TextRenderer(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::Bind(&TextRendererTest::OnAddTextTrack, base::Unretained(this))));
text_renderer_.reset();
}
diff --git a/media/base/user_input_monitor_unittest.cc b/media/base/user_input_monitor_unittest.cc
index f174daff..e7ac3a7 100644
--- a/media/base/user_input_monitor_unittest.cc
+++ b/media/base/user_input_monitor_unittest.cc
@@ -21,11 +21,11 @@
TEST(UserInputMonitorTest, CreatePlatformSpecific) {
#if defined(OS_LINUX)
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
#else
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
#endif // defined(OS_LINUX)
std::unique_ptr<UserInputMonitor> monitor = UserInputMonitor::Create(
@@ -43,11 +43,11 @@
TEST(UserInputMonitorTest, CreatePlatformSpecificWithMapping) {
#if defined(OS_LINUX)
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
#else
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
#endif // defined(OS_LINUX)
std::unique_ptr<UserInputMonitor> monitor = UserInputMonitor::Create(
diff --git a/media/base/video_thumbnail_decoder_unittest.cc b/media/base/video_thumbnail_decoder_unittest.cc
index c36cfe4..789f858 100644
--- a/media/base/video_thumbnail_decoder_unittest.cc
+++ b/media/base/video_thumbnail_decoder_unittest.cc
@@ -69,7 +69,7 @@
frame_ = std::move(frame);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockVideoDecoder* mock_video_decoder_;
std::unique_ptr<VideoThumbnailDecoder> thumbnail_decoder_;
diff --git a/media/blink/run_all_unittests.cc b/media/blink/run_all_unittests.cc
index 1e61f7d4c..b54d456 100644
--- a/media/blink/run_all_unittests.cc
+++ b/media/blink/run_all_unittests.cc
@@ -34,7 +34,7 @@
#endif // defined(V8_USE_EXTERNAL_STARTUP_DATA)
// We must use a custom blink::Platform that ensures the main thread scheduler
-// knows about the ScopedTaskEnvironment.
+// knows about the TaskEnvironment.
class BlinkPlatformWithTaskEnvironment : public blink::Platform {
public:
BlinkPlatformWithTaskEnvironment()
@@ -51,7 +51,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<blink::scheduler::WebThreadScheduler> main_thread_scheduler_;
DISALLOW_COPY_AND_ASSIGN(BlinkPlatformWithTaskEnvironment);
diff --git a/media/blink/webmediaplayer_impl_unittest.cc b/media/blink/webmediaplayer_impl_unittest.cc
index eaa6dae..43ba3b5 100644
--- a/media/blink/webmediaplayer_impl_unittest.cc
+++ b/media/blink/webmediaplayer_impl_unittest.cc
@@ -659,7 +659,7 @@
// This runs until we reach the |ready_state_|. Attempting to wait for ready
// states < kReadyStateHaveCurrentData in non-startup-suspend test cases is
// unreliable due to asynchronous execution of tasks on the
- // base::test:ScopedTaskEnvironment.
+ // base::test:TaskEnvironment.
void LoadAndWaitForReadyState(std::string data_file,
blink::WebMediaPlayer::ReadyState ready_state) {
Load(data_file);
@@ -839,7 +839,7 @@
// This runs until we reach the have current data state. Attempting to wait
// for states < kReadyStateHaveCurrentData is unreliable due to asynchronous
- // execution of tasks on the base::test:ScopedTaskEnvironment.
+ // execution of tasks on the base::test:TaskEnvironment.
while (wmpi_->GetReadyState() <
blink::WebMediaPlayer::kReadyStateHaveCurrentData) {
base::RunLoop loop;
diff --git a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
index 33be8b42..05c880a40 100644
--- a/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
+++ b/media/capabilities/in_memory_video_decode_stats_db_unittest.cc
@@ -86,7 +86,7 @@
in_memory_db_->Initialize(base::BindOnce(&InMemoryDBTestBase::InitializeCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
MOCK_METHOD1(InitializeCB, void(bool success));
@@ -101,7 +101,7 @@
using VideoDescKey = media::VideoDecodeStatsDB::VideoDescKey;
using DecodeStatsEntry = media::VideoDecodeStatsDB::DecodeStatsEntry;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockSeedDB> seed_db_;
std::unique_ptr<MockDBProvider> db_provider_;
std::unique_ptr<InMemoryVideoDecodeStatsDBImpl> in_memory_db_;
@@ -122,7 +122,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, ReadExpectingEmpty) {
@@ -141,7 +141,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, ReadExpectingSeedData) {
@@ -163,7 +163,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Verify a second GetDecodeStats() call with the same key does not trigger a
@@ -174,7 +174,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, AppendReadAndClear) {
@@ -202,7 +202,7 @@
base::BindOnce(&InMemoryDBTestBase::AppendDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Seed DB should not be queried again for this key.
@@ -214,7 +214,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Append the same seed entry again to triple the stats. Additional appends
@@ -236,7 +236,7 @@
in_memory_db_->ClearStats(base::BindOnce(&InMemoryDBTestBase::ClearStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// With in-memory stats now gone, GetDecodeStats(kTestKey()) should again
@@ -247,7 +247,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeedlessInMemoryDBTest, AppendReadAndClear) {
@@ -269,7 +269,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Append same stats again to test summation.
@@ -285,7 +285,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Now destroy the in-memory stats...
@@ -293,7 +293,7 @@
in_memory_db_->ClearStats(base::BindOnce(&InMemoryDBTestBase::ClearStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Verify DB now empty for this key.
@@ -302,7 +302,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, ProvidedNullSeedDB) {
@@ -316,7 +316,7 @@
in_memory_db_->Initialize(base::BindOnce(&InMemoryDBTestBase::InitializeCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Writes still succeed.
@@ -333,7 +333,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, SeedReadFailureOnGettingStats) {
@@ -354,7 +354,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, SeedReadFailureOnAppendingingStats) {
@@ -377,7 +377,7 @@
base::BindOnce(&InMemoryDBTestBase::AppendDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
::testing::Mock::VerifyAndClear(this);
// Reading the appended data works without issue and does not trigger new
@@ -388,7 +388,7 @@
kTestKey(), base::BindOnce(&InMemoryDBTestBase::GetDecodeStatsCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(SeededInMemoryDBTest, SeedDBTearDownRace) {
diff --git a/media/capabilities/video_decode_stats_db_impl_unittest.cc b/media/capabilities/video_decode_stats_db_impl_unittest.cc
index 003ba18d8..88ccb33 100644
--- a/media/capabilities/video_decode_stats_db_impl_unittest.cc
+++ b/media/capabilities/video_decode_stats_db_impl_unittest.cc
@@ -157,7 +157,7 @@
MOCK_METHOD0(MockClearStatsCb, void());
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const VideoDescKey kStatsKeyVp9;
const VideoDescKey kStatsKeyAvc;
diff --git a/media/capture/video/chromeos/camera_device_delegate_unittest.cc b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
index 8085aab5..6b5e6b5 100644
--- a/media/capture/video/chromeos/camera_device_delegate_unittest.cc
+++ b/media/capture/video/chromeos/camera_device_delegate_unittest.cc
@@ -462,7 +462,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<CameraHalDelegate> camera_hal_delegate_;
std::unique_ptr<CameraDeviceDelegate> camera_device_delegate_;
diff --git a/media/capture/video/chromeos/camera_hal_delegate_unittest.cc b/media/capture/video/chromeos/camera_hal_delegate_unittest.cc
index 7c38d0ac..32c0dad 100644
--- a/media/capture/video/chromeos/camera_hal_delegate_unittest.cc
+++ b/media/capture/video/chromeos/camera_hal_delegate_unittest.cc
@@ -59,7 +59,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<CameraHalDelegate> camera_hal_delegate_;
testing::StrictMock<unittest_internal::MockCameraModule> mock_camera_module_;
testing::StrictMock<unittest_internal::MockVendorTagOps> mock_vendor_tag_ops_;
diff --git a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
index e3ec27c..5e3bfae0 100644
--- a/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
+++ b/media/capture/video/chromeos/camera_hal_dispatcher_impl_unittest.cc
@@ -122,7 +122,7 @@
CameraHalDispatcherImpl* dispatcher_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
DISALLOW_COPY_AND_ASSIGN(CameraHalDispatcherImplTest);
};
diff --git a/media/capture/video/chromeos/request_manager_unittest.cc b/media/capture/video/chromeos/request_manager_unittest.cc
index 560e3ce..0d84420 100644
--- a/media/capture/video/chromeos/request_manager_unittest.cc
+++ b/media/capture/video/chromeos/request_manager_unittest.cc
@@ -280,7 +280,7 @@
private:
std::unique_ptr<base::RunLoop> run_loop_;
bool quit_;
- base::test::ScopedTaskEnvironment scoped_test_environment_;
+ base::test::TaskEnvironment scoped_test_environment_;
};
// A basic sanity test to capture one frame with the capture loop.
diff --git a/media/capture/video/fake_video_capture_device_unittest.cc b/media/capture/video/fake_video_capture_device_unittest.cc
index f79012e4..4a3c5a6 100644
--- a/media/capture/video/fake_video_capture_device_unittest.cc
+++ b/media/capture/video/fake_video_capture_device_unittest.cc
@@ -202,7 +202,7 @@
const VideoCaptureFormat& last_format() const { return last_format_; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<VideoCaptureDeviceDescriptors> descriptors_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<MockVideoCaptureDeviceClient> client_;
diff --git a/media/capture/video/file_video_capture_device_unittest.cc b/media/capture/video/file_video_capture_device_unittest.cc
index c32d147..6bb89f0f 100644
--- a/media/capture/video/file_video_capture_device_unittest.cc
+++ b/media/capture/video/file_video_capture_device_unittest.cc
@@ -67,7 +67,7 @@
MockImageCaptureClient image_capture_client_;
std::unique_ptr<VideoCaptureDevice> device_;
VideoCaptureFormat last_format_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(FileVideoCaptureDeviceTest, GetPhotoState) {
diff --git a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
index 23ad2c0..79edc7bf 100644
--- a/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate_unittest.cc
@@ -186,7 +186,7 @@
0)) {}
~V4L2CaptureDelegateTest() override = default;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
VideoCaptureDeviceDescriptor device_descriptor_;
scoped_refptr<V4L2CaptureDevice> v4l2_;
std::unique_ptr<V4L2CaptureDelegate> delegate_;
diff --git a/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc b/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc
index eecb165..4830405 100644
--- a/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc
+++ b/media/capture/video/linux/video_capture_device_factory_linux_unittest.cc
@@ -82,7 +82,7 @@
std::move(fake_device_provider));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeV4L2Impl* fake_v4l2_;
DescriptorDeviceProvider* fake_device_provider_;
std::unique_ptr<VideoCaptureDeviceFactoryLinux> factory_;
diff --git a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
index ca95f53..3ad52f9 100644
--- a/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
+++ b/media/capture/video/mac/video_capture_device_factory_mac_unittest.mm
@@ -17,8 +17,8 @@
// required, because on MacOS the capture code must run on a CFRunLoop
// enabled message loop.
void RunTestCase(base::OnceClosure test_case) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
base::RunLoop run_loop;
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::BindOnce(
diff --git a/media/capture/video/video_capture_device_unittest.cc b/media/capture/video/video_capture_device_unittest.cc
index 72a28aa..5a6ddd7 100644
--- a/media/capture/video/video_capture_device_unittest.cc
+++ b/media/capture/video/video_capture_device_unittest.cc
@@ -250,8 +250,7 @@
#if defined(OS_MACOSX)
// Video capture code on MacOSX must run on a CFRunLoop enabled thread
// for interaction with AVFoundation.
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
#endif
device_descriptors_(new VideoCaptureDeviceDescriptors()),
main_thread_task_runner_(base::ThreadTaskRunnerHandle::Get()),
@@ -462,7 +461,7 @@
#if defined(OS_WIN)
base::win::ScopedCOMInitializer initialize_com_;
#endif
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<VideoCaptureDeviceDescriptors> device_descriptors_;
std::unique_ptr<base::RunLoop> run_loop_;
scoped_refptr<base::TaskRunner> main_thread_task_runner_;
diff --git a/media/cast/net/udp_packet_pipe_unittest.cc b/media/cast/net/udp_packet_pipe_unittest.cc
index 1bdae8a..68a15dd3 100644
--- a/media/cast/net/udp_packet_pipe_unittest.cc
+++ b/media/cast/net/udp_packet_pipe_unittest.cc
@@ -39,7 +39,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<UdpPacketPipeWriter> writer_;
std::unique_ptr<UdpPacketPipeReader> reader_;
base::circular_deque<std::unique_ptr<Packet>> packets_read_;
@@ -59,7 +59,7 @@
EXPECT_CALL(done_callback, Run()).Times(1);
writer_->Write(new base::RefCountedData<Packet>(packet1),
done_callback.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// |packet2| can not be completely written in the data pipe due to capacity
// limit.
@@ -67,7 +67,7 @@
EXPECT_CALL(done_callback2, Run()).Times(0);
writer_->Write(new base::RefCountedData<Packet>(packet2),
done_callback2.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(&done_callback2);
EXPECT_TRUE(packets_read_.empty());
@@ -75,7 +75,7 @@
EXPECT_CALL(done_callback2, Run()).Times(1);
reader_->Read(
base::BindOnce(&UdpPacketPipeTest::OnPacketRead, base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1u, packets_read_.size());
EXPECT_EQ(0, std::memcmp(packet1.data(), packets_read_.front()->data(),
packet1.size()));
@@ -84,7 +84,7 @@
// Reads |packet2| from the pipe.
reader_->Read(
base::BindOnce(&UdpPacketPipeTest::OnPacketRead, base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1u, packets_read_.size());
EXPECT_EQ(0, std::memcmp(packet2.data(), packets_read_.front()->data(),
packet2.size()));
diff --git a/media/cast/net/udp_transport_unittest.cc b/media/cast/net/udp_transport_unittest.cc
index 50775a4..b3ce0e5 100644
--- a/media/cast/net/udp_transport_unittest.cc
+++ b/media/cast/net/udp_transport_unittest.cc
@@ -71,18 +71,17 @@
class UdpTransportImplTest : public ::testing::Test {
public:
UdpTransportImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
net::IPEndPoint free_local_port1 = test::GetFreeLocalPort();
net::IPEndPoint free_local_port2 = test::GetFreeLocalPort();
send_transport_ = std::make_unique<UdpTransportImpl>(
- scoped_task_environment_.GetMainThreadTaskRunner(), free_local_port1,
+ task_environment_.GetMainThreadTaskRunner(), free_local_port1,
free_local_port2, base::BindRepeating(&UpdateCastTransportStatus));
send_transport_->SetSendBufferSize(65536);
recv_transport_ = std::make_unique<UdpTransportImpl>(
- scoped_task_environment_.GetMainThreadTaskRunner(), free_local_port2,
+ task_environment_.GetMainThreadTaskRunner(), free_local_port2,
free_local_port1, base::BindRepeating(&UpdateCastTransportStatus));
recv_transport_->SetSendBufferSize(65536);
}
@@ -90,7 +89,7 @@
~UdpTransportImplTest() override = default;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<UdpTransportImpl> send_transport_;
diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc
index db064be..d902b45f 100644
--- a/media/cast/sender/h264_vt_encoder_unittest.cc
+++ b/media/cast/sender/h264_vt_encoder_unittest.cc
@@ -215,9 +215,9 @@
std::unique_ptr<TestPowerSource>(power_source_));
cast_environment_ = new CastEnvironment(
- &clock_, scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner());
+ &clock_, task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner());
encoder_.reset(new H264VideoToolboxEncoder(
cast_environment_, video_sender_config_,
base::Bind(&SaveOperationalStatus, &operational_status_)));
@@ -253,7 +253,7 @@
static FrameSenderConfig video_sender_config_;
base::SimpleTestTickClock clock_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<CastEnvironment> cast_environment_;
std::unique_ptr<VideoEncoder> encoder_;
OperationalStatus operational_status_;
diff --git a/media/cast/test/end2end_unittest.cc b/media/cast/test/end2end_unittest.cc
index bf67267..e2b20fec 100644
--- a/media/cast/test/end2end_unittest.cc
+++ b/media/cast/test/end2end_unittest.cc
@@ -879,7 +879,7 @@
std::vector<std::pair<base::TimeTicks, base::TimeTicks> > video_ticks_;
// |transport_sender_| has a RepeatingTimer which needs a MessageLoop.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
namespace {
diff --git a/media/cast/test/utility/tap_proxy.cc b/media/cast/test/utility/tap_proxy.cc
index c1f50c7..5350caaf 100644
--- a/media/cast/test/utility/tap_proxy.cc
+++ b/media/cast/test/utility/tap_proxy.cc
@@ -304,8 +304,8 @@
int fd1 = tun_alloc(argv[1], IFF_TAP);
int fd2 = tun_alloc(argv[2], IFF_TAP);
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
last_printout = base::TimeTicks::Now();
media::cast::test::QueueManager qm1(fd1, fd2, std::move(in_pipe));
media::cast::test::QueueManager qm2(fd2, fd1, std::move(out_pipe));
diff --git a/media/cdm/aes_decryptor_unittest.cc b/media/cdm/aes_decryptor_unittest.cc
index 0664e40..9169d544 100644
--- a/media/cdm/aes_decryptor_unittest.cc
+++ b/media/cdm/aes_decryptor_unittest.cc
@@ -493,7 +493,7 @@
}
// Must be the first member to be initialized first and destroyed last.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockCdmClient> cdm_client_;
scoped_refptr<ContentDecryptionModule> cdm_;
diff --git a/media/cdm/cdm_adapter_unittest.cc b/media/cdm/cdm_adapter_unittest.cc
index 39f4b7e..eb3f451 100644
--- a/media/cdm/cdm_adapter_unittest.cc
+++ b/media/cdm/cdm_adapter_unittest.cc
@@ -177,7 +177,7 @@
}
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
StrictMock<MockCdmClient> cdm_client_;
StrictMock<MockCdmAuxiliaryHelper>* cdm_helper_ = nullptr;
@@ -185,7 +185,7 @@
// Keep track of the loaded CDM.
scoped_refptr<ContentDecryptionModule> cdm_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
DISALLOW_COPY_AND_ASSIGN(CdmAdapterTestBase);
diff --git a/media/device_monitors/system_message_window_win_unittest.cc b/media/device_monitors/system_message_window_win_unittest.cc
index a9eee37..57de00a 100644
--- a/media/device_monitors/system_message_window_win_unittest.cc
+++ b/media/device_monitors/system_message_window_win_unittest.cc
@@ -29,8 +29,8 @@
}
// Run single threaded to not require explicit COM initialization
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY};
base::SystemMonitor system_monitor_;
base::MockDevicesChangedObserver observer_;
SystemMessageWindowWin window_;
diff --git a/media/filters/android/video_frame_extractor_unittest.cc b/media/filters/android/video_frame_extractor_unittest.cc
index a0a3e72..8efbb143 100644
--- a/media/filters/android/video_frame_extractor_unittest.cc
+++ b/media/filters/android/video_frame_extractor_unittest.cc
@@ -65,7 +65,7 @@
const base::FilePath& temp_dir() const { return temp_dir_.GetPath(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<FileDataSource> data_source_;
std::unique_ptr<VideoFrameExtractor> extractor_;
diff --git a/media/filters/aom_video_decoder_unittest.cc b/media/filters/aom_video_decoder_unittest.cc
index 27498ac..5a19671 100644
--- a/media/filters/aom_video_decoder_unittest.cc
+++ b/media/filters/aom_video_decoder_unittest.cc
@@ -164,7 +164,7 @@
testing::StrictMock<MockMediaLog> media_log_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AomVideoDecoder> decoder_;
scoped_refptr<DecoderBuffer> i_frame_buffer_;
diff --git a/media/filters/audio_decoder_stream_unittest.cc b/media/filters/audio_decoder_stream_unittest.cc
index d64bb1d..6b3abffe 100644
--- a/media/filters/audio_decoder_stream_unittest.cc
+++ b/media/filters/audio_decoder_stream_unittest.cc
@@ -113,7 +113,7 @@
std::move(closure).Run();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
testing::NiceMock<MockDemuxerStream> demuxer_stream_{DemuxerStream::AUDIO};
AudioDecoderStream audio_decoder_stream_;
diff --git a/media/filters/audio_decoder_unittest.cc b/media/filters/audio_decoder_unittest.cc
index b5435e7..9ec8764c 100644
--- a/media/filters/audio_decoder_unittest.cc
+++ b/media/filters/audio_decoder_unittest.cc
@@ -134,12 +134,12 @@
switch (decoder_type_) {
case FFMPEG:
decoder_.reset(new FFmpegAudioDecoder(
- scoped_task_environment_.GetMainThreadTaskRunner(), &media_log_));
+ task_environment_.GetMainThreadTaskRunner(), &media_log_));
break;
#if defined(OS_ANDROID)
case MEDIA_CODEC:
decoder_.reset(new MediaCodecAudioDecoder(
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
break;
#endif
}
@@ -393,7 +393,7 @@
// that the decoder can be reinitialized with different parameters.
TestParams params_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
scoped_refptr<DecoderBuffer> data_;
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 9f36319..96d996a 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -1247,7 +1247,7 @@
return true;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockMediaLog> media_log_;
@@ -4415,7 +4415,7 @@
void DisableAndEnableDemuxerTracks(
ChunkDemuxer* demuxer,
- base::test::ScopedTaskEnvironment* scoped_task_environment) {
+ base::test::TaskEnvironment* task_environment) {
base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
std::vector<MediaTrack::Id> audio_tracks;
@@ -4447,7 +4447,7 @@
base::BindOnce(QuitLoop, base::Passed(enable_audio.QuitClosure())));
enable_audio.Run();
- scoped_task_environment->RunUntilIdle();
+ task_environment->RunUntilIdle();
}
}
@@ -4461,16 +4461,16 @@
EXPECT_NE(nullptr, video_stream);
// Verify stream status changes without pending read.
- DisableAndEnableDemuxerTracks(demuxer_.get(), &scoped_task_environment_);
+ DisableAndEnableDemuxerTracks(demuxer_.get(), &task_environment_);
// Verify stream status changes with pending read.
bool read_done = false;
audio_stream->Read(base::Bind(&OnReadDone_EOSExpected, &read_done));
- DisableAndEnableDemuxerTracks(demuxer_.get(), &scoped_task_environment_);
+ DisableAndEnableDemuxerTracks(demuxer_.get(), &task_environment_);
EXPECT_TRUE(read_done);
read_done = false;
video_stream->Read(base::Bind(&OnReadDone_EOSExpected, &read_done));
- DisableAndEnableDemuxerTracks(demuxer_.get(), &scoped_task_environment_);
+ DisableAndEnableDemuxerTracks(demuxer_.get(), &task_environment_);
EXPECT_TRUE(read_done);
}
diff --git a/media/filters/dav1d_video_decoder_unittest.cc b/media/filters/dav1d_video_decoder_unittest.cc
index 27eb02a..3660e88 100644
--- a/media/filters/dav1d_video_decoder_unittest.cc
+++ b/media/filters/dav1d_video_decoder_unittest.cc
@@ -172,7 +172,7 @@
testing::StrictMock<MockMediaLog> media_log_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<Dav1dVideoDecoder> decoder_;
scoped_refptr<DecoderBuffer> i_frame_buffer_;
diff --git a/media/filters/decoder_selector_unittest.cc b/media/filters/decoder_selector_unittest.cc
index a0ae269..4004d0e 100644
--- a/media/filters/decoder_selector_unittest.cc
+++ b/media/filters/decoder_selector_unittest.cc
@@ -201,7 +201,7 @@
if (use_decrypting_decoder_) {
decoders.push_back(
std::make_unique<typename TypeParam::DecryptingDecoder>(
- scoped_task_environment_.GetMainThreadTaskRunner(), &media_log_));
+ task_environment_.GetMainThreadTaskRunner(), &media_log_));
}
#endif // !defined(OS_ANDROID)
@@ -246,7 +246,7 @@
void CreateDecoderSelector() {
decoder_selector_ =
std::make_unique<DecoderSelector<TypeParam::kStreamType>>(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::BindRepeating(&Self::CreateDecoders, base::Unretained(this)),
&media_log_);
decoder_selector_->Initialize(
@@ -289,9 +289,9 @@
RunUntilIdle();
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
std::unique_ptr<StreamTraits> traits_;
diff --git a/media/filters/decrypting_audio_decoder_unittest.cc b/media/filters/decrypting_audio_decoder_unittest.cc
index e1d52e6..87515ad 100644
--- a/media/filters/decrypting_audio_decoder_unittest.cc
+++ b/media/filters/decrypting_audio_decoder_unittest.cc
@@ -57,7 +57,7 @@
public:
DecryptingAudioDecoderTest()
: decoder_(new DecryptingAudioDecoder(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
&media_log_)),
cdm_context_(new StrictMock<MockCdmContext>()),
decryptor_(new StrictMock<MockDecryptor>()),
@@ -244,7 +244,7 @@
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
std::unique_ptr<DecryptingAudioDecoder> decoder_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/decrypting_demuxer_stream_unittest.cc b/media/filters/decrypting_demuxer_stream_unittest.cc
index ad1468ea..876fd6a 100644
--- a/media/filters/decrypting_demuxer_stream_unittest.cc
+++ b/media/filters/decrypting_demuxer_stream_unittest.cc
@@ -69,7 +69,7 @@
public:
DecryptingDemuxerStreamTest()
: demuxer_stream_(new DecryptingDemuxerStream(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
&media_log_,
base::Bind(&DecryptingDemuxerStreamTest::OnWaiting,
base::Unretained(this)))),
@@ -264,7 +264,7 @@
void(DemuxerStream::Status, scoped_refptr<DecoderBuffer>));
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockMediaLog> media_log_;
std::unique_ptr<DecryptingDemuxerStream> demuxer_stream_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/decrypting_media_resource_unittest.cc b/media/filters/decrypting_media_resource_unittest.cc
index 7823115..6ff50c4 100644
--- a/media/filters/decrypting_media_resource_unittest.cc
+++ b/media/filters/decrypting_media_resource_unittest.cc
@@ -69,7 +69,7 @@
decrypting_media_resource_ = std::make_unique<DecryptingMediaResource>(
&demuxer_, &cdm_context_, &null_media_log_,
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
}
~DecryptingMediaResourceTest() {
@@ -108,7 +108,7 @@
void(DemuxerStream::Status, scoped_refptr<DecoderBuffer>));
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::MockCallback<DecryptingMediaResource::InitCB>
decrypting_media_resource_init_cb_;
base::MockCallback<WaitingCB> waiting_cb_;
@@ -132,7 +132,7 @@
decrypting_media_resource_->Initialize(
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(
decrypting_media_resource_->DecryptingDemuxerStreamCountForTesting(), 2);
@@ -147,7 +147,7 @@
decrypting_media_resource_->Initialize(
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// When using an AesDecryptor we preemptively wrap our streams with a
// DecryptingDemuxerStream, regardless of encryption. With this in mind, we
@@ -168,7 +168,7 @@
decrypting_media_resource_->Initialize(
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(
decrypting_media_resource_->DecryptingDemuxerStreamCountForTesting(), 2);
@@ -190,7 +190,7 @@
decrypting_media_resource_->Initialize(
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DecryptingMediaResourceTest,
@@ -205,7 +205,7 @@
decrypting_media_resource_->Initialize(
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(DecryptingMediaResourceTest, WaitingCallback) {
@@ -223,7 +223,7 @@
decrypting_media_resource_init_cb_.Get(), waiting_cb_.Get());
decrypting_media_resource_->GetAllStreams().front()->Read(base::BindRepeating(
&DecryptingMediaResourceTest::BufferReady, base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
} // namespace media
diff --git a/media/filters/decrypting_video_decoder_unittest.cc b/media/filters/decrypting_video_decoder_unittest.cc
index bebba2a..7b8170e 100644
--- a/media/filters/decrypting_video_decoder_unittest.cc
+++ b/media/filters/decrypting_video_decoder_unittest.cc
@@ -51,7 +51,7 @@
public:
DecryptingVideoDecoderTest()
: decoder_(new DecryptingVideoDecoder(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
&media_log_)),
cdm_context_(new StrictMock<MockCdmContext>()),
decryptor_(new StrictMock<MockDecryptor>()),
@@ -221,7 +221,7 @@
MOCK_METHOD1(OnWaiting, void(WaitingReason));
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
std::unique_ptr<DecryptingVideoDecoder> decoder_;
std::unique_ptr<StrictMock<MockCdmContext>> cdm_context_;
diff --git a/media/filters/demuxer_perftest.cc b/media/filters/demuxer_perftest.cc
index e5eb6df..5436d5b 100644
--- a/media/filters/demuxer_perftest.cc
+++ b/media/filters/demuxer_perftest.cc
@@ -176,7 +176,7 @@
NullMediaLog media_log_;
for (int i = 0; i < kBenchmarkIterations; ++i) {
// Setup.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DemuxerHostImpl demuxer_host;
FileDataSource data_source;
ASSERT_TRUE(data_source.Initialize(file_path));
diff --git a/media/filters/fake_video_decoder_unittest.cc b/media/filters/fake_video_decoder_unittest.cc
index a1a729d..07b5ecb1 100644
--- a/media/filters/fake_video_decoder_unittest.cc
+++ b/media/filters/fake_video_decoder_unittest.cc
@@ -221,7 +221,7 @@
DCHECK(!is_reset_pending_);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
VideoDecoderConfig current_config_;
std::unique_ptr<FakeVideoDecoder> decoder_;
diff --git a/media/filters/ffmpeg_demuxer_unittest.cc b/media/filters/ffmpeg_demuxer_unittest.cc
index b0033da..765e3b7 100644
--- a/media/filters/ffmpeg_demuxer_unittest.cc
+++ b/media/filters/ffmpeg_demuxer_unittest.cc
@@ -117,7 +117,7 @@
if (demuxer_)
demuxer_->Stop();
demuxer_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
data_source_.reset();
}
@@ -268,7 +268,7 @@
// Fixture members.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// TODO(wolenetz): Consider expanding MediaLog verification coverage here
// using StrictMock<MockMediaLog> for all FFmpegDemuxerTests. See
@@ -487,12 +487,12 @@
audio->Read(NewReadCB(FROM_HERE, 29, 0, true, DemuxerStream::kAborted));
demuxer_->AbortPendingReads();
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Additional reads should also be aborted (until a Seek()).
audio->Read(NewReadCB(FROM_HERE, 29, 0, true, DemuxerStream::kAborted));
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Ensure blocking thread has completed outstanding work.
demuxer_->Stop();
@@ -516,7 +516,7 @@
audio->Read(NewReadCB(FROM_HERE, 27, 3000, true));
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(166866, demuxer_->GetMemoryUsage());
}
@@ -534,7 +534,7 @@
video->Read(NewReadCB(FROM_HERE, 1057, 33000, false));
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(148778, demuxer_->GetMemoryUsage());
}
@@ -1066,7 +1066,7 @@
// Attempt the read...
audio->Read(callback.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
;
// Don't let the test call Stop() again.
@@ -1696,7 +1696,7 @@
void DisableAndEnableDemuxerTracks(
FFmpegDemuxer* demuxer,
- base::test::ScopedTaskEnvironment* scoped_task_environment) {
+ base::test::TaskEnvironment* task_environment) {
base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
base::WaitableEvent::InitialState::NOT_SIGNALED);
std::vector<MediaTrack::Id> audio_tracks;
@@ -1728,7 +1728,7 @@
base::BindOnce(QuitLoop, base::Passed(enable_audio.QuitClosure())));
enable_audio.Run();
- scoped_task_environment->RunUntilIdle();
+ task_environment->RunUntilIdle();
}
void OnReadDoneExpectEos(DemuxerStream::Status status,
@@ -1749,7 +1749,7 @@
EXPECT_NE(nullptr, video_stream);
// Verify stream status notifications delivery without pending read first.
- DisableAndEnableDemuxerTracks(demuxer_.get(), &scoped_task_environment_);
+ DisableAndEnableDemuxerTracks(demuxer_.get(), &task_environment_);
// Verify that stream notifications are delivered properly when stream status
// changes with a pending read. Call FlushBuffers before reading, to ensure
@@ -1761,7 +1761,7 @@
audio_stream->Read(base::Bind(&OnReadDoneExpectEos));
video_stream->Read(base::Bind(&OnReadDoneExpectEos));
- DisableAndEnableDemuxerTracks(demuxer_.get(), &scoped_task_environment_);
+ DisableAndEnableDemuxerTracks(demuxer_.get(), &task_environment_);
}
TEST_F(FFmpegDemuxerTest, MultitrackMemoryUsage) {
@@ -1776,7 +1776,7 @@
// shouldn't be too high.
audio->Read(NewReadCB(FROM_HERE, 304, 0, true));
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(22134, demuxer_->GetMemoryUsage());
// Now enable all demuxer streams in the file and perform another read, this
@@ -1788,7 +1788,7 @@
audio->Read(NewReadCB(FROM_HERE, 166, 21000, true));
base::RunLoop().Run();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// With newly enabled demuxer streams the amount of memory used by the demuxer
// is much higher.
EXPECT_EQ(156011, demuxer_->GetMemoryUsage());
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index f806b697..40e88ec 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -200,7 +200,7 @@
StrictMock<MockMediaLog> media_log_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FFmpegVideoDecoder> decoder_;
// Various buffers for testing.
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index 3afe81a..c9d74fd 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -298,7 +298,7 @@
stream->StartReturningData();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockMediaLog> media_log_;
StrictMock<FrameProcessorTestCallbackHelper> callbacks_;
diff --git a/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc b/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc
index 5eae26f..21e9ce3 100644
--- a/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc
+++ b/media/filters/fuchsia/fuchsia_video_decoder_unittest.cc
@@ -73,9 +73,9 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY,
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY,
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<VideoDecoder> decoder_;
std::list<scoped_refptr<VideoFrame>> output_frames_;
diff --git a/media/filters/offloading_video_decoder_unittest.cc b/media/filters/offloading_video_decoder_unittest.cc
index 86e0fe0..e249a6e 100644
--- a/media/filters/offloading_video_decoder_unittest.cc
+++ b/media/filters/offloading_video_decoder_unittest.cc
@@ -66,9 +66,9 @@
class OffloadingVideoDecoderTest : public testing::Test {
public:
OffloadingVideoDecoderTest()
- : task_env_(base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ : task_env_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
void CreateWrapper(int offload_width, VideoCodec codec) {
decoder_ = new testing::StrictMock<MockOffloadableVideoDecoder>();
@@ -187,7 +187,7 @@
MOCK_METHOD1(DecodeDone, void(DecodeStatus));
MOCK_METHOD0(ResetDone, void(void));
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
std::unique_ptr<OffloadingVideoDecoder> offloading_decoder_;
testing::StrictMock<MockOffloadableVideoDecoder>* decoder_ =
nullptr; // Owned by |offloading_decoder_|.
diff --git a/media/filters/pipeline_controller_unittest.cc b/media/filters/pipeline_controller_unittest.cc
index dcbb3af..e932d1f 100644
--- a/media/filters/pipeline_controller_unittest.cc
+++ b/media/filters/pipeline_controller_unittest.cc
@@ -158,7 +158,7 @@
void OnAudioDecoderChange(const PipelineDecoderInfo& info) override {}
void OnVideoDecoderChange(const PipelineDecoderInfo& info) override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<MockDemuxer> demuxer_;
StrictMock<MockPipeline>* pipeline_;
diff --git a/media/filters/video_decoder_stream_unittest.cc b/media/filters/video_decoder_stream_unittest.cc
index 1c4e99c..58f6fb4027 100644
--- a/media/filters/video_decoder_stream_unittest.cc
+++ b/media/filters/video_decoder_stream_unittest.cc
@@ -85,7 +85,7 @@
has_no_key_(false) {
video_decoder_stream_.reset(new VideoDecoderStream(
std::make_unique<VideoDecoderStream::StreamTraits>(&media_log_),
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::BindRepeating(&VideoDecoderStreamTest::CreateVideoDecodersForTest,
base::Unretained(this)),
&media_log_));
@@ -139,7 +139,7 @@
void PrepareFrame(scoped_refptr<VideoFrame> frame,
VideoDecoderStream::OutputReadyCB output_ready_cb) {
// Simulate some delay in return of the output.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(std::move(output_ready_cb), std::move(frame)));
}
@@ -167,7 +167,7 @@
// Note this is _not_ inserted into |decoders_| below, so we don't need to
// adjust the indices used below to compensate.
decoders.push_back(std::make_unique<DecryptingVideoDecoder>(
- scoped_task_environment_.GetMainThreadTaskRunner(), &media_log_));
+ task_environment_.GetMainThreadTaskRunner(), &media_log_));
#endif
for (int i = 0; i < 3; ++i) {
@@ -463,7 +463,7 @@
SatisfyPendingCallback(DECODER_REINIT);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<MockMediaLog> media_log_;
std::unique_ptr<VideoDecoderStream> video_decoder_stream_;
diff --git a/media/filters/vpx_video_decoder_unittest.cc b/media/filters/vpx_video_decoder_unittest.cc
index befb24e..87fe071 100644
--- a/media/filters/vpx_video_decoder_unittest.cc
+++ b/media/filters/vpx_video_decoder_unittest.cc
@@ -162,7 +162,7 @@
MOCK_METHOD1(DecodeDone, void(DecodeStatus));
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
std::unique_ptr<VideoDecoder> decoder_;
scoped_refptr<DecoderBuffer> i_frame_buffer_;
diff --git a/media/gpu/android/codec_allocator_unittest.cc b/media/gpu/android/codec_allocator_unittest.cc
index d57e7b43..721b368 100644
--- a/media/gpu/android/codec_allocator_unittest.cc
+++ b/media/gpu/android/codec_allocator_unittest.cc
@@ -72,8 +72,8 @@
std::unique_ptr<MediaCodecBridge> codec) {
// This should always be called on the main thread, despite whatever thread
// the allocator happens to be running on.
- ASSERT_TRUE(scoped_task_environment_.GetMainThreadTaskRunner()
- ->BelongsToCurrentThread());
+ ASSERT_TRUE(
+ task_environment_.GetMainThreadTaskRunner()->BelongsToCurrentThread());
last_created_codec_.reset(
reinterpret_cast<MockMediaCodecBridge*>(codec.release()));
@@ -85,8 +85,8 @@
void OnCodecReleasedInternal(base::OnceClosure quit_closure) {
// This should always be called on the main thread, despite whatever thread
// the allocator happens to be running on.
- ASSERT_TRUE(scoped_task_environment_.GetMainThreadTaskRunner()
- ->BelongsToCurrentThread());
+ ASSERT_TRUE(
+ task_environment_.GetMainThreadTaskRunner()->BelongsToCurrentThread());
OnCodecReleased();
std::move(quit_closure).Run();
}
@@ -110,7 +110,7 @@
protected:
// So that we can get the thread's task runner.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Thread allocator_thread_;
@@ -265,7 +265,7 @@
// QuitClosure may run before the initial release processes, so RunUntilIdle
// here such that hung status is cleared.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Running the loop should clear hung status.
ASSERT_FALSE(IsPrimaryTaskRunnerLikelyHung());
@@ -294,7 +294,7 @@
// QuitClosure may run before the initial release processes, so RunUntilIdle
// here such that hung status is cleared.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Running the loop should clear hung status.
ASSERT_FALSE(IsPrimaryTaskRunnerLikelyHung());
@@ -341,7 +341,7 @@
// QuitClosure may run before the initial release processes, so RunUntilIdle
// here such that hung status is cleared.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Running the loop should clear hung status.
ASSERT_FALSE(IsPrimaryTaskRunnerLikelyHung());
diff --git a/media/gpu/android/codec_image_group_unittest.cc b/media/gpu/android/codec_image_group_unittest.cc
index 788ed2b..79777b1 100644
--- a/media/gpu/android/codec_image_group_unittest.cc
+++ b/media/gpu/android/codec_image_group_unittest.cc
@@ -79,7 +79,7 @@
// Handy method to check that CodecImage destruction is relayed properly.
MOCK_METHOD1(OnCodecImageDestroyed, void(CodecImage*));
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
// Our thread is the mcvd thread. This is the task runner for the gpu thread.
scoped_refptr<base::TestSimpleTaskRunner> gpu_task_runner_;
diff --git a/media/gpu/android/codec_image_unittest.cc b/media/gpu/android/codec_image_unittest.cc
index 69aae32..ae05be6a 100644
--- a/media/gpu/android/codec_image_unittest.cc
+++ b/media/gpu/android/codec_image_unittest.cc
@@ -98,7 +98,7 @@
virtual bool BindsTextureOnUpdate() { return true; }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<MockMediaCodecBridge>* codec_;
std::unique_ptr<CodecWrapper> wrapper_;
scoped_refptr<NiceMock<MockCodecBufferWaitCoordinator>>
diff --git a/media/gpu/android/codec_wrapper_unittest.cc b/media/gpu/android/codec_wrapper_unittest.cc
index 2abcd6c..317b126 100644
--- a/media/gpu/android/codec_wrapper_unittest.cc
+++ b/media/gpu/android/codec_wrapper_unittest.cc
@@ -66,7 +66,7 @@
}
// So that we can get the thread's task runner.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
NiceMock<MockMediaCodecBridge>* codec_;
std::unique_ptr<CodecWrapper> wrapper_;
diff --git a/media/gpu/android/media_codec_video_decoder_unittest.cc b/media/gpu/android/media_codec_video_decoder_unittest.cc
index 573e4ff..0f9c58fc 100644
--- a/media/gpu/android/media_codec_video_decoder_unittest.cc
+++ b/media/gpu/android/media_codec_video_decoder_unittest.cc
@@ -278,7 +278,7 @@
protected:
const VideoCodec codec_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::android::ScopedJavaGlobalRef<jobject> java_surface_;
scoped_refptr<DecoderBuffer> fake_decoder_buffer_;
std::unique_ptr<MockDeviceInfo> device_info_;
diff --git a/media/gpu/android/texture_pool_unittest.cc b/media/gpu/android/texture_pool_unittest.cc
index cc21988f..07f244f8 100644
--- a/media/gpu/android/texture_pool_unittest.cc
+++ b/media/gpu/android/texture_pool_unittest.cc
@@ -55,7 +55,7 @@
return texture_weak;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
diff --git a/media/gpu/android/video_frame_factory_impl_unittest.cc b/media/gpu/android/video_frame_factory_impl_unittest.cc
index e7748b77..cf52861 100644
--- a/media/gpu/android/video_frame_factory_impl_unittest.cc
+++ b/media/gpu/android/video_frame_factory_impl_unittest.cc
@@ -114,7 +114,7 @@
base::RunLoop().RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
std::unique_ptr<VideoFrameFactoryImpl> impl_;
diff --git a/media/gpu/ipc/service/picture_buffer_manager_unittest.cc b/media/gpu/ipc/service/picture_buffer_manager_unittest.cc
index 2d3e284..1d162b67 100644
--- a/media/gpu/ipc/service/picture_buffer_manager_unittest.cc
+++ b/media/gpu/ipc/service/picture_buffer_manager_unittest.cc
@@ -71,7 +71,7 @@
return sync_token;
}
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
uint64_t next_release_count_ = 1;
testing::StrictMock<
diff --git a/media/gpu/ipc/service/vda_video_decoder_unittest.cc b/media/gpu/ipc/service/vda_video_decoder_unittest.cc
index a7ba09d6..79b10ad5 100644
--- a/media/gpu/ipc/service/vda_video_decoder_unittest.cc
+++ b/media/gpu/ipc/service/vda_video_decoder_unittest.cc
@@ -288,7 +288,7 @@
return std::move(owned_vda_);
}
- base::test::ScopedTaskEnvironment environment_;
+ base::test::TaskEnvironment environment_;
base::Thread gpu_thread_;
testing::NiceMock<MockMediaLog> media_log_;
diff --git a/media/gpu/linux/platform_video_frame_pool_unittest.cc b/media/gpu/linux/platform_video_frame_pool_unittest.cc
index f01b489..e3ecf41 100644
--- a/media/gpu/linux/platform_video_frame_pool_unittest.cc
+++ b/media/gpu/linux/platform_video_frame_pool_unittest.cc
@@ -54,8 +54,7 @@
using DmabufId = PlatformVideoFramePool::DmabufId;
PlatformVideoFramePoolTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {
pool_.reset(new PlatformVideoFramePool(
base::BindRepeating(&CreateDmabufVideoFrame), &test_clock_));
pool_->set_parent_task_runner(base::ThreadTaskRunnerHandle::Get());
@@ -90,7 +89,7 @@
DmabufId GetDmabufId(const VideoFrame& frame) { return &(frame.DmabufFds()); }
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::SimpleTestTickClock test_clock_;
std::unique_ptr<PlatformVideoFramePool,
std::default_delete<DmabufVideoFramePool>>
@@ -114,7 +113,7 @@
// Clear frame reference to return the frame to the pool.
frame = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Verify that the next frame from the pool uses the same memory.
scoped_refptr<VideoFrame> new_frame = GetFrame(20);
@@ -129,18 +128,18 @@
DmabufId id2 = GetDmabufId(*frame2);
frame1 = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
frame1 = GetFrame(30);
EXPECT_EQ(id1, GetDmabufId(*frame1));
frame2 = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
frame2 = GetFrame(40);
EXPECT_EQ(id2, GetDmabufId(*frame2));
frame1 = nullptr;
frame2 = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
CheckPoolSize(2u);
}
@@ -152,7 +151,7 @@
// Clear frame references to return the frames to the pool.
frame_a = nullptr;
frame_b = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Verify that both frames are in the pool.
CheckPoolSize(2u);
@@ -173,16 +172,16 @@
// Drop frame and verify that resources are still available for reuse.
frame_1 = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
CheckPoolSize(1u);
// Advance clock far enough to hit stale timer; ensure only frame_1 has its
// resources released.
base::TimeDelta time_forward = base::TimeDelta::FromMinutes(1);
test_clock_.Advance(time_forward);
- scoped_task_environment_.FastForwardBy(time_forward);
+ task_environment_.FastForwardBy(time_forward);
frame_2 = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
CheckPoolSize(1u);
}
diff --git a/media/gpu/test/video_test_environment.cc b/media/gpu/test/video_test_environment.cc
index a0f20df..1c17ab7 100644
--- a/media/gpu/test/video_test_environment.cc
+++ b/media/gpu/test/video_test_environment.cc
@@ -46,8 +46,8 @@
// thread and allow posting tasks to other threads. This is required for video
// tests to function correctly.
TestTimeouts::Initialize();
- task_environment_ = std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
// Perform all static initialization that is required when running video
// decoders in a test environment.
diff --git a/media/gpu/test/video_test_environment.h b/media/gpu/test/video_test_environment.h
index 76838d7..2756a39 100644
--- a/media/gpu/test/video_test_environment.h
+++ b/media/gpu/test/video_test_environment.h
@@ -21,7 +21,7 @@
namespace base {
namespace test {
-class ScopedTaskEnvironment;
+class TaskEnvironment;
} // namespace test
} // namespace base
@@ -48,7 +48,7 @@
// An exit manager is required to run callbacks on shutdown.
base::AtExitManager at_exit_manager;
- std::unique_ptr<base::test::ScopedTaskEnvironment> task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
#if defined(USE_OZONE)
std::unique_ptr<ui::OzoneGpuTestHelper> gpu_helper_;
diff --git a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
index d9af91e0..28b1b67 100644
--- a/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
+++ b/media/gpu/vaapi/vaapi_image_decode_accelerator_worker_unittest.cc
@@ -159,7 +159,7 @@
void(std::unique_ptr<gpu::ImageDecodeAcceleratorWorker::DecodeResult>));
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<VaapiImageDecodeAcceleratorWorker> worker_;
DISALLOW_COPY_AND_ASSIGN(VaapiImageDecodeAcceleratorWorkerTest);
@@ -224,7 +224,7 @@
std::move(webp_encoded_data), kVisibleSize,
base::BindOnce(&VaapiImageDecodeAcceleratorWorkerTest::OnDecodeCompleted,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VaapiImageDecodeAcceleratorWorkerTest, ImageDecodeFails) {
@@ -266,7 +266,7 @@
std::move(webp_encoded_data), kVisibleSize,
base::BindOnce(&VaapiImageDecodeAcceleratorWorkerTest::OnDecodeCompleted,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VaapiImageDecodeAcceleratorWorkerTest, UnknownImageDecodeFails) {
@@ -276,7 +276,7 @@
std::move(encoded_data), kVisibleSize,
base::BindOnce(&VaapiImageDecodeAcceleratorWorkerTest::OnDecodeCompleted,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
} // namespace media
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
index 397f7e2..28e062c4 100644
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator_unittest.cc
@@ -363,7 +363,7 @@
MOCK_METHOD0(NotifyResetDone, void());
MOCK_METHOD1(NotifyError, void(VideoDecodeAccelerator::Error));
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// The class under test and a worker thread for it.
VaapiVideoDecodeAccelerator vda_;
diff --git a/media/gpu/video_decode_accelerator_unittest.cc b/media/gpu/video_decode_accelerator_unittest.cc
index 614be10..ddcbbc4c 100644
--- a/media/gpu/video_decode_accelerator_unittest.cc
+++ b/media/gpu/video_decode_accelerator_unittest.cc
@@ -1714,12 +1714,10 @@
// which uses COM. We need the thread to be a UI thread.
// On Ozone, the backend initializes the event system using a UI
// thread.
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
#else
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>();
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>();
#endif // OS_WIN || OS_CHROMEOS
media::g_env =
@@ -1742,11 +1740,11 @@
}
void Shutdown() override {
- scoped_task_environment_.reset();
+ task_environment_.reset();
base::TestSuite::Shutdown();
}
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
};
} // namespace
diff --git a/media/gpu/video_encode_accelerator_unittest.cc b/media/gpu/video_encode_accelerator_unittest.cc
index 9a829e77..98d6b64c 100644
--- a/media/gpu/video_encode_accelerator_unittest.cc
+++ b/media/gpu/video_encode_accelerator_unittest.cc
@@ -3076,12 +3076,10 @@
base::TestSuite::Initialize();
#if defined(OS_CHROMEOS)
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
#else
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>();
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>();
#endif
media::g_env =
reinterpret_cast<media::VideoEncodeAcceleratorTestEnvironment*>(
@@ -3106,12 +3104,12 @@
}
void Shutdown() override {
- scoped_task_environment_.reset();
+ task_environment_.reset();
base::TestSuite::Shutdown();
}
private:
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
};
} // namespace
diff --git a/media/gpu/windows/d3d11_cdm_proxy_unittest.cc b/media/gpu/windows/d3d11_cdm_proxy_unittest.cc
index 374f9a9..efda4038 100644
--- a/media/gpu/windows/d3d11_cdm_proxy_unittest.cc
+++ b/media/gpu/windows/d3d11_cdm_proxy_unittest.cc
@@ -297,7 +297,7 @@
const UINT kPrivateOutputSize = 40;
// ObjectWatcher uses SequencedTaskRunnerHandle.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Verifies that if device creation fails, then the call fails.
diff --git a/media/gpu/windows/d3d11_video_decoder_unittest.cc b/media/gpu/windows/d3d11_video_decoder_unittest.cc
index 8803fda..ed003d8 100644
--- a/media/gpu/windows/d3d11_video_decoder_unittest.cc
+++ b/media/gpu/windows/d3d11_video_decoder_unittest.cc
@@ -229,7 +229,7 @@
MOCK_METHOD1(MockInitCB, void(bool));
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
scoped_refptr<base::SingleThreadTaskRunner> gpu_task_runner_;
diff --git a/media/learning/impl/distribution_reporter_unittest.cc b/media/learning/impl/distribution_reporter_unittest.cc
index 55f1f4a..ecdac1c 100644
--- a/media/learning/impl/distribution_reporter_unittest.cc
+++ b/media/learning/impl/distribution_reporter_unittest.cc
@@ -25,7 +25,7 @@
task_.target_description.ordering = LearningTask::Ordering::kNumeric;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> ukm_recorder_;
diff --git a/media/learning/impl/extra_trees_trainer_unittest.cc b/media/learning/impl/extra_trees_trainer_unittest.cc
index d9e1897..f926957 100644
--- a/media/learning/impl/extra_trees_trainer_unittest.cc
+++ b/media/learning/impl/extra_trees_trainer_unittest.cc
@@ -38,11 +38,11 @@
[](std::unique_ptr<Model>* model_out,
std::unique_ptr<Model> model) { *model_out = std::move(model); },
&model));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return model;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestRandomNumberGenerator rng_;
ExtraTreesTrainer trainer_;
diff --git a/media/learning/impl/learning_fuzzertest.cc b/media/learning/impl/learning_fuzzertest.cc
index cfff3d4..e46de5b 100644
--- a/media/learning/impl/learning_fuzzertest.cc
+++ b/media/learning/impl/learning_fuzzertest.cc
@@ -40,7 +40,7 @@
}
extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
FuzzedDataProvider provider(data, size);
LearningTask task;
@@ -67,7 +67,7 @@
controller.CompleteObservation(
id, ObservationCompletion(TargetValue(ConsumeDouble(&provider)),
ConsumeDouble(&provider)));
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
return 0;
diff --git a/media/learning/impl/learning_session_impl_unittest.cc b/media/learning/impl/learning_session_impl_unittest.cc
index d69ec98..bad8353 100644
--- a/media/learning/impl/learning_session_impl_unittest.cc
+++ b/media/learning/impl/learning_session_impl_unittest.cc
@@ -104,10 +104,10 @@
// To prevent a memory leak, reset the session. This will post destruction
// of other objects, so RunUntilIdle().
session_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
@@ -125,13 +125,13 @@
EXPECT_EQ(task_runners_.size(), 0u);
session_->RegisterTask(task_0_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(task_controllers_.size(), 1u);
EXPECT_EQ(task_runners_.size(), 1u);
EXPECT_EQ(task_runners_[0], task_runner_.get());
session_->RegisterTask(task_1_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(task_controllers_.size(), 2u);
EXPECT_EQ(task_runners_.size(), 2u);
EXPECT_EQ(task_runners_[1], task_runner_.get());
@@ -160,7 +160,7 @@
ltc_1->CompleteObservation(
id, ObservationCompletion(example_1.target_value, example_1.weight));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(task_controllers_[0]->example_, example_0);
EXPECT_EQ(task_controllers_[1]->example_, example_1);
}
@@ -174,7 +174,7 @@
// Destroy the session. |controller| should still be usable, though it won't
// forward requests anymore.
session_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Should not crash.
controller->BeginObservation(base::UnguessableToken::Create(),
@@ -186,7 +186,7 @@
bool flag = false;
session_->RegisterTask(
task_0_, base::SequenceBound<FakeFeatureProvider>(task_runner_, &flag));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Registering the task should create a FakeLearningTaskController, which will
// call AddFeatures on the fake FeatureProvider.
EXPECT_TRUE(flag);
@@ -197,18 +197,18 @@
std::unique_ptr<LearningTaskController> controller =
session_->GetController(task_0_.name);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Start an observation and verify that it starts.
base::UnguessableToken id = base::UnguessableToken::Create();
controller->BeginObservation(id, FeatureVector());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(task_controllers_[0]->id_, id);
EXPECT_NE(task_controllers_[0]->cancelled_id_, id);
// Should result in cancelling the observation.
controller.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(task_controllers_[0]->cancelled_id_, id);
}
diff --git a/media/learning/impl/learning_task_controller_helper_unittest.cc b/media/learning/impl/learning_task_controller_helper_unittest.cc
index 606c7a7..0427537 100644
--- a/media/learning/impl/learning_task_controller_helper_unittest.cc
+++ b/media/learning/impl/learning_task_controller_helper_unittest.cc
@@ -51,7 +51,7 @@
// To prevent a memory leak, reset the helper. This will post destruction
// of other objects, so RunUntilIdle().
helper_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void CreateClient(bool include_fp) {
@@ -60,7 +60,7 @@
if (include_fp) {
sb_fp = base::SequenceBound<FakeFeatureProvider>(task_runner_,
&fp_features_, &fp_cb_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// TODO(liberato): make sure this works without a fp.
@@ -82,7 +82,7 @@
return helper_->pending_example_count_for_testing();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SequencedTaskRunner> task_runner_;
@@ -126,7 +126,7 @@
helper_->BeginObservation(id_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
helper_->CancelObservation(id_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(most_recent_example_);
EXPECT_EQ(pending_example_count(), 0u);
}
@@ -136,7 +136,7 @@
CreateClient(true);
helper_->BeginObservation(id_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The feature provider should know about the example.
EXPECT_EQ(fp_features_, example_.features);
@@ -149,7 +149,7 @@
// Add the features, and verify that they arrive at the AddExampleCB.
example_.features[0] = FeatureValue(456);
std::move(fp_cb_).Run(example_.features);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(pending_example_count(), 0u);
EXPECT_TRUE(most_recent_example_);
EXPECT_EQ(*most_recent_example_, example_);
@@ -161,7 +161,7 @@
CreateClient(true);
helper_->BeginObservation(id_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The feature provider should know about the example.
EXPECT_EQ(fp_features_, example_.features);
@@ -174,7 +174,7 @@
// example was sent to us.
example_.features[0] = FeatureValue(456);
std::move(fp_cb_).Run(example_.features);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(pending_example_count(), 0u);
EXPECT_FALSE(most_recent_example_);
}
@@ -184,7 +184,7 @@
CreateClient(true);
helper_->BeginObservation(id_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The feature provider should know about the example.
EXPECT_EQ(fp_features_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
@@ -192,7 +192,7 @@
// Add the features, and verify that the example isn't sent yet.
example_.features[0] = FeatureValue(456);
std::move(fp_cb_).Run(example_.features);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(most_recent_example_);
EXPECT_EQ(pending_example_count(), 1u);
@@ -210,7 +210,7 @@
CreateClient(true);
helper_->BeginObservation(id_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The feature provider should know about the example.
EXPECT_EQ(fp_features_, example_.features);
EXPECT_EQ(pending_example_count(), 1u);
@@ -220,14 +220,14 @@
// callback yet; we might send a TargetValue.
example_.features[0] = FeatureValue(456);
std::move(fp_cb_).Run(example_.features);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(most_recent_example_);
EXPECT_EQ(pending_example_count(), 1u);
// Cancel the observation, and verify that the pending example has been
// removed, and no example was sent to us.
helper_->CancelObservation(id_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(most_recent_example_);
EXPECT_EQ(pending_example_count(), 0u);
}
diff --git a/media/learning/impl/learning_task_controller_impl_unittest.cc b/media/learning/impl/learning_task_controller_impl_unittest.cc
index 9daec3a..29c196bf 100644
--- a/media/learning/impl/learning_task_controller_impl_unittest.cc
+++ b/media/learning/impl/learning_task_controller_impl_unittest.cc
@@ -112,7 +112,7 @@
// To prevent a memory leak, reset the controller. This may post
// destruction of other objects, so RunUntilIdle().
controller_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void CreateController(SequenceBoundFeatureProvider feature_provider =
@@ -137,7 +137,7 @@
id, ObservationCompletion(example.target_value, example.weight));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Number of models that we trained.
int num_models_ = 0;
@@ -208,7 +208,7 @@
example.features.push_back(FeatureValue(123));
example.weight = 321u;
AddExample(example);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(trainer_raw_->training_data()[0].features[0], FeatureValue(124));
EXPECT_EQ(trainer_raw_->training_data()[0].weight, example.weight);
}
diff --git a/media/learning/impl/lookup_table_trainer_unittest.cc b/media/learning/impl/lookup_table_trainer_unittest.cc
index 4761874..94cd79a9 100644
--- a/media/learning/impl/lookup_table_trainer_unittest.cc
+++ b/media/learning/impl/lookup_table_trainer_unittest.cc
@@ -23,11 +23,11 @@
[](std::unique_ptr<Model>* model_out,
std::unique_ptr<Model> model) { *model_out = std::move(model); },
&model));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return model;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
LookupTableTrainer trainer_;
LearningTask task_;
diff --git a/media/learning/impl/random_tree_trainer_unittest.cc b/media/learning/impl/random_tree_trainer_unittest.cc
index f9face03..ac7dd32 100644
--- a/media/learning/impl/random_tree_trainer_unittest.cc
+++ b/media/learning/impl/random_tree_trainer_unittest.cc
@@ -38,11 +38,11 @@
[](std::unique_ptr<Model>* model_out,
std::unique_ptr<Model> model) { *model_out = std::move(model); },
&model));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return model;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestRandomNumberGenerator rng_;
RandomTreeTrainer trainer_;
diff --git a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
index 99e8a39..c338fef 100644
--- a/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
+++ b/media/learning/mojo/mojo_learning_task_controller_service_unittest.cc
@@ -72,7 +72,7 @@
LearningTask task_;
// Mojo stuff.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeLearningTaskController* controller_raw_ = nullptr;
diff --git a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
index 546aae1..44fd87f 100644
--- a/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
+++ b/media/learning/mojo/public/cpp/mojo_learning_task_controller_unittest.cc
@@ -70,7 +70,7 @@
}
// Mojo stuff.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeMojoLearningTaskController fake_learning_controller_;
mojo::Binding<mojom::LearningTaskController> learning_controller_binding_;
@@ -83,7 +83,7 @@
base::UnguessableToken id = base::UnguessableToken::Create();
FeatureVector features = {FeatureValue(123), FeatureValue(456)};
learning_controller_->BeginObservation(id, features);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(id, fake_learning_controller_.begin_args_.id_);
EXPECT_EQ(features, fake_learning_controller_.begin_args_.features_);
}
@@ -92,7 +92,7 @@
base::UnguessableToken id = base::UnguessableToken::Create();
ObservationCompletion completion(TargetValue(1234));
learning_controller_->CompleteObservation(id, completion);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(id, fake_learning_controller_.complete_args_.id_);
EXPECT_EQ(completion.target_value,
fake_learning_controller_.complete_args_.completion_.target_value);
@@ -101,7 +101,7 @@
TEST_F(MojoLearningTaskControllerTest, Cancel) {
base::UnguessableToken id = base::UnguessableToken::Create();
learning_controller_->CancelObservation(id);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(id, fake_learning_controller_.cancel_args_.id_);
}
diff --git a/media/midi/midi_manager_unittest.cc b/media/midi/midi_manager_unittest.cc
index d4bd314..eef9d48 100644
--- a/media/midi/midi_manager_unittest.cc
+++ b/media/midi/midi_manager_unittest.cc
@@ -221,7 +221,7 @@
base::WeakPtr<FakeMidiManagerFactory> factory() { return factory_; }
private:
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
base::WeakPtr<FakeMidiManagerFactory> factory_;
std::unique_ptr<MidiService> service_;
@@ -354,7 +354,7 @@
// SystemMonitor is needed on Windows.
base::SystemMonitor system_monitor;
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
std::unique_ptr<FakeMidiManagerClient> client_;
std::unique_ptr<MidiService> service_;
diff --git a/media/mojo/clients/mojo_android_overlay_unittest.cc b/media/mojo/clients/mojo_android_overlay_unittest.cc
index 744f401f7..5eab2ed 100644
--- a/media/mojo/clients/mojo_android_overlay_unittest.cc
+++ b/media/mojo/clients/mojo_android_overlay_unittest.cc
@@ -155,7 +155,7 @@
}
// Mojo stuff.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
// The mock provider that |overlay_client_| will talk to.
// |interface_provider_| will bind it.
diff --git a/media/mojo/clients/mojo_audio_decoder_unittest.cc b/media/mojo/clients/mojo_audio_decoder_unittest.cc
index 2aa1fd3..5c7848f 100644
--- a/media/mojo/clients/mojo_audio_decoder_unittest.cc
+++ b/media/mojo/clients/mojo_audio_decoder_unittest.cc
@@ -66,7 +66,7 @@
base::Unretained(this),
base::Passed(mojo::MakeRequest(&remote_audio_decoder))));
mojo_audio_decoder_.reset(
- new MojoAudioDecoder(scoped_task_environment_.GetMainThreadTaskRunner(),
+ new MojoAudioDecoder(task_environment_.GetMainThreadTaskRunner(),
std::move(remote_audio_decoder)));
}
@@ -219,7 +219,7 @@
RunLoop();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
// The MojoAudioDecoder that we are testing.
diff --git a/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc b/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
index 43abea79..3c6c391 100644
--- a/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
+++ b/media/mojo/clients/mojo_video_encode_accelerator_unittest.cc
@@ -172,7 +172,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// This member holds on to the mock implementation of the "service" side.
mojo::StrongBindingPtr<mojom::VideoEncodeAccelerator> mojo_vea_binding_;
diff --git a/media/mojo/common/mojo_data_pipe_read_write_unittest.cc b/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
index d0abf64..3c23314 100644
--- a/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
+++ b/media/mojo/common/mojo_data_pipe_read_write_unittest.cc
@@ -67,7 +67,7 @@
} // namespace
TEST(MojoDataPipeReadWriteTest, Normal) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::string kData = "hello, world";
MojoDataPipeReadWrite pipe_read_write_;
pipe_read_write_.WriteAndRead(reinterpret_cast<const uint8_t*>(kData.data()),
@@ -75,7 +75,7 @@
}
TEST(MojoDataPipeReadWriteTest, SequentialReading) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::string kData1 = "hello, world";
std::string kData2 = "Bye!";
MojoDataPipeReadWrite pipe_read_write_;
@@ -86,7 +86,7 @@
}
TEST(MojoDataPipeReadWriteTest, LongerThanCapacity) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::string kData = "hello, world, hello, world, hello, world";
MojoDataPipeReadWrite pipe_read_write_(10);
pipe_read_write_.WriteAndRead(reinterpret_cast<const uint8_t*>(kData.data()),
@@ -94,7 +94,7 @@
}
TEST(MojoDataPipeReadWriteTest, DiscardDataInPipe) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::string kData1 = "to be discarded";
std::string kData2 = "hello, world, hello, world, hello, world";
MojoDataPipeReadWrite pipe_read_write_(10);
diff --git a/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc b/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
index db659da..84c33a6a 100644
--- a/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
+++ b/media/mojo/common/mojo_decoder_buffer_converter_unittest.cc
@@ -59,7 +59,7 @@
} // namespace
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_Normal) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const uint8_t kData[] = "hello, world";
const uint8_t kSideData[] = "sideshow bob";
const size_t kDataSize = base::size(kData);
@@ -79,7 +79,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EOS) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CreateEOSBuffer());
MojoDecoderBufferConverter converter;
@@ -89,7 +89,7 @@
// TODO(xhwang): Investigate whether we can get rid of zero-byte-buffer.
// See http://crbug.com/663438
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_ZeroByteBuffer) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(0));
MojoDecoderBufferConverter converter;
@@ -97,7 +97,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_KeyFrame) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const uint8_t kData[] = "hello, world";
const size_t kDataSize = base::size(kData);
@@ -111,7 +111,7 @@
}
TEST(MojoDecoderBufferConverterTest, ConvertDecoderBuffer_EncryptedBuffer) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const uint8_t kData[] = "hello, world";
const size_t kDataSize = base::size(kData);
const char kKeyId[] = "00112233445566778899aabbccddeeff";
@@ -150,7 +150,7 @@
// This test verifies that a DecoderBuffer larger than data-pipe capacity
// can be transmitted properly.
TEST(MojoDecoderBufferConverterTest, Chunked) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
const size_t kDataSize = base::size(kData);
scoped_refptr<DecoderBuffer> buffer =
@@ -163,7 +163,7 @@
// This test verifies that MojoDecoderBufferReader::ReadCB is called with a
// NULL DecoderBuffer if data pipe is closed during transmission.
TEST(MojoDecoderBufferConverterTest, WriterSidePipeError) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
const size_t kDataSize = base::size(kData);
scoped_refptr<DecoderBuffer> media_buffer =
@@ -191,7 +191,7 @@
// This test verifies that MojoDecoderBuffer supports concurrent writes and
// reads.
TEST(MojoDecoderBufferConverterTest, ConcurrentDecoderBuffers) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
// Prevent all of the buffers from fitting at once to exercise the chunking
@@ -237,7 +237,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushWithoutRead) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
base::MockCallback<base::OnceClosure> mock_flush_cb;
@@ -250,7 +250,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushAfterRead) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -271,7 +271,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushBeforeRead) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -299,7 +299,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushBeforeChunkedRead) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -328,7 +328,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushDuringChunkedRead) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
const uint8_t kData[] = "Lorem ipsum dolor sit amet, consectetur cras amet";
@@ -357,7 +357,7 @@
}
TEST(MojoDecoderBufferConverterTest, FlushDuringConcurrentReads) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
// Prevent all of the buffers from fitting at once to exercise the chunking
diff --git a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
index c3d1ba2..fbb2d0a9 100644
--- a/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
+++ b/media/mojo/mojom/video_frame_mojom_traits_unittest.cc
@@ -53,7 +53,7 @@
std::move(callback).Run(f);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(VideoFrameStructTraitsTest);
diff --git a/media/mojo/services/cdm_service_unittest.cc b/media/mojo/services/cdm_service_unittest.cc
index cae4028..d1fd1382 100644
--- a/media/mojo/services/cdm_service_unittest.cc
+++ b/media/mojo/services/cdm_service_unittest.cc
@@ -127,7 +127,7 @@
CdmService* cdm_service() { return service_.get(); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojom::CdmServicePtr cdm_service_ptr_;
mojom::CdmFactoryPtr cdm_factory_ptr_;
mojom::ContentDecryptionModulePtr cdm_ptr_;
@@ -207,8 +207,8 @@
}
// Same as DestroyCdmFactory test, but do not disable delayed service release.
-// TODO(xhwang): Use ScopedTaskEnvironment::TimeSource::MOCK_TIME and
-// ScopedTaskEnvironment::FastForwardBy() so we don't have to really wait for
+// TODO(xhwang): Use TaskEnvironment::TimeSource::MOCK_TIME and
+// TaskEnvironment::FastForwardBy() so we don't have to really wait for
// the delay in the test. But currently FastForwardBy() doesn't support delayed
// task yet.
TEST_F(CdmServiceTest, DestroyCdmFactory_DelayedServiceRelease) {
diff --git a/media/mojo/services/deferred_destroy_strong_binding_set_unittest.cc b/media/mojo/services/deferred_destroy_strong_binding_set_unittest.cc
index 7794340..303c127 100644
--- a/media/mojo/services/deferred_destroy_strong_binding_set_unittest.cc
+++ b/media/mojo/services/deferred_destroy_strong_binding_set_unittest.cc
@@ -59,7 +59,7 @@
~DeferredDestroyStrongBindingSetTest() override = default;
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(DeferredDestroyStrongBindingSetTest, Destructor) {
diff --git a/media/mojo/services/media_service_unittest.cc b/media/mojo/services/media_service_unittest.cc
index 4ebc31b..bd0a6a4 100644
--- a/media/mojo/services/media_service_unittest.cc
+++ b/media/mojo/services/media_service_unittest.cc
@@ -276,7 +276,7 @@
MOCK_METHOD0(MediaServiceConnectionClosed, void());
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestServiceManager test_service_manager_;
service_manager::TestService test_service_;
diff --git a/media/mojo/services/mojo_audio_input_stream_unittest.cc b/media/mojo/services/mojo_audio_input_stream_unittest.cc
index 4241233..4ae5864 100644
--- a/media/mojo/services/mojo_audio_input_stream_unittest.cc
+++ b/media/mojo/services/mojo_audio_input_stream_unittest.cc
@@ -172,7 +172,7 @@
.WillOnce(SaveArg<0>(&delegate_event_handler_));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::CancelableSyncSocket local_;
std::unique_ptr<TestCancelableSyncSocket> foreign_socket_;
base::ReadOnlySharedMemoryRegion mem_;
diff --git a/media/mojo/services/mojo_audio_output_stream_provider_unittest.cc b/media/mojo/services/mojo_audio_output_stream_provider_unittest.cc
index 3c70c07..43eb4e4 100644
--- a/media/mojo/services/mojo_audio_output_stream_provider_unittest.cc
+++ b/media/mojo/services/mojo_audio_output_stream_provider_unittest.cc
@@ -68,7 +68,7 @@
} // namespace
TEST(MojoAudioOutputStreamProviderTest, AcquireTwice_BadMessage) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
bool got_bad_message = false;
mojo::core::SetDefaultProcessErrorCallback(
base::BindRepeating([](bool* got_bad_message,
@@ -104,7 +104,7 @@
TEST(MojoAudioOutputStreamProviderTest,
Bitstream_BadMessageOnNonAndoirdPlatforms) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
bool got_bad_message = false;
mojo::core::SetDefaultProcessErrorCallback(
base::BindRepeating([](bool* got_bad_message,
diff --git a/media/mojo/services/mojo_audio_output_stream_unittest.cc b/media/mojo/services/mojo_audio_output_stream_unittest.cc
index 8f76539..d40179b 100644
--- a/media/mojo/services/mojo_audio_output_stream_unittest.cc
+++ b/media/mojo/services/mojo_audio_output_stream_unittest.cc
@@ -171,7 +171,7 @@
.WillOnce(SaveArg<0>(&delegate_event_handler_));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::CancelableSyncSocket local_;
std::unique_ptr<TestCancelableSyncSocket> foreign_socket_;
base::UnsafeSharedMemoryRegion mem_;
diff --git a/media/mojo/services/mojo_cdm_file_io_unittest.cc b/media/mojo/services/mojo_cdm_file_io_unittest.cc
index b1145a3b..310353b7 100644
--- a/media/mojo/services/mojo_cdm_file_io_unittest.cc
+++ b/media/mojo/services/mojo_cdm_file_io_unittest.cc
@@ -91,7 +91,7 @@
void ReportFileReadSize(int file_size_bytes) override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MojoCdmFileIO> file_io_;
std::unique_ptr<MockFileIOClient> client_;
mojom::CdmStoragePtr cdm_storage_ptr_;
diff --git a/media/mojo/services/mojo_cdm_helper_unittest.cc b/media/mojo/services/mojo_cdm_helper_unittest.cc
index 52914a0..7f960f7 100644
--- a/media/mojo/services/mojo_cdm_helper_unittest.cc
+++ b/media/mojo/services/mojo_cdm_helper_unittest.cc
@@ -94,7 +94,7 @@
MojoCdmHelperTest() : helper_(&test_interface_provider_) {}
~MojoCdmHelperTest() override = default;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestInterfaceProvider test_interface_provider_;
MockFileIOClient file_io_client_;
MojoCdmHelper helper_;
diff --git a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
index 35071bc..cf9f338 100644
--- a/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
+++ b/media/mojo/services/mojo_video_encode_accelerator_service_unittest.cc
@@ -120,7 +120,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::StrongBindingPtr<mojom::VideoEncodeAcceleratorClient> mojo_vea_binding_;
diff --git a/media/mojo/services/video_decode_perf_history_unittest.cc b/media/mojo/services/video_decode_perf_history_unittest.cc
index 0e9c4f6..973ab39 100644
--- a/media/mojo/services/video_decode_perf_history_unittest.cc
+++ b/media/mojo/services/video_decode_perf_history_unittest.cc
@@ -341,7 +341,7 @@
static constexpr double kMinPowerEfficientDecodedFramePercent =
VideoDecodePerfHistory::kMinPowerEfficientDecodedFramePercent;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_recorder_;
@@ -432,7 +432,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -531,7 +531,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -559,7 +559,7 @@
GetFakeDB()->CompleteInitialize(false);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -618,7 +618,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -645,14 +645,14 @@
base::BindOnce(&VideoDecodePerfHistoryTest::MockGetVideoDecodeStatsDBCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Complete successful deferred DB initialization (see comment at top of test)
if (params.defer_initialize) {
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -675,14 +675,14 @@
base::BindOnce(&VideoDecodePerfHistoryTest::MockGetVideoDecodeStatsDBCB,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Complete failed deferred DB initialization (see comment at top of test)
if (params.defer_initialize) {
GetFakeDB()->CompleteInitialize(false);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -734,7 +734,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -786,7 +786,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -901,7 +901,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -1021,7 +1021,7 @@
GetFakeDB()->CompleteInitialize(true);
// Allow initialize-deferred API calls to complete.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
diff --git a/media/mojo/services/watch_time_recorder_unittest.cc b/media/mojo/services/watch_time_recorder_unittest.cc
index 5428599..e1d1602 100644
--- a/media/mojo/services/watch_time_recorder_unittest.cc
+++ b/media/mojo/services/watch_time_recorder_unittest.cc
@@ -160,7 +160,7 @@
MOCK_METHOD0(GetCurrentMediaTime, base::TimeDelta());
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojom::MediaMetricsProviderPtr provider_;
std::unique_ptr<base::HistogramTester> histogram_tester_;
std::unique_ptr<ukm::TestAutoSetUkmRecorder> test_recorder_;
diff --git a/media/mojo/test/mojo_video_decoder_integration_test.cc b/media/mojo/test/mojo_video_decoder_integration_test.cc
index 56d2d256..45f0d82a 100644
--- a/media/mojo/test/mojo_video_decoder_integration_test.cc
+++ b/media/mojo/test/mojo_video_decoder_integration_test.cc
@@ -203,7 +203,7 @@
}
protected:
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
void SetWriterCapacity(uint32_t capacity) { writer_capacity_ = capacity; }
@@ -324,7 +324,7 @@
return std::unique_ptr<VideoDecoder>(decoder_.get());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Capacity that will be used for the MojoDecoderBufferWriter.
uint32_t writer_capacity_ = 0;
diff --git a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
index 3c679e5..b6c8ed3 100644
--- a/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
+++ b/media/mojo/test/mojo_video_encode_accelerator_integration_test.cc
@@ -108,7 +108,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// This member holds on to the implementation of the "service" side.
mojo::StrongBindingPtr<mojom::VideoEncodeAccelerator> mojo_vea_binding_;
diff --git a/media/remoting/courier_renderer_unittest.cc b/media/remoting/courier_renderer_unittest.cc
index 9887c904..c81da06 100644
--- a/media/remoting/courier_renderer_unittest.cc
+++ b/media/remoting/courier_renderer_unittest.cc
@@ -389,7 +389,7 @@
RunPendingTasks();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<RendererController> controller_;
std::unique_ptr<RendererClientImpl> render_client_;
std::unique_ptr<FakeMediaResource> media_resource_;
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
index 2849580..813ea377 100644
--- a/media/renderers/audio_renderer_impl_unittest.cc
+++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -507,7 +507,7 @@
// Fixture members.
AudioParameters hardware_params_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
const scoped_refptr<base::SingleThreadTaskRunner> main_thread_task_runner_;
NullMediaLog media_log_;
std::unique_ptr<AudioRendererImpl> renderer_;
diff --git a/media/renderers/decrypting_renderer_unittest.cc b/media/renderers/decrypting_renderer_unittest.cc
index 728371c..e784d4f 100644
--- a/media/renderers/decrypting_renderer_unittest.cc
+++ b/media/renderers/decrypting_renderer_unittest.cc
@@ -38,7 +38,7 @@
renderer_ = renderer.get();
decrypting_renderer_ = std::make_unique<DecryptingRenderer>(
std::move(renderer), &null_media_log_,
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
EXPECT_CALL(cdm_context_, GetDecryptor())
.WillRepeatedly(Return(&decryptor_));
@@ -85,7 +85,7 @@
}
bool use_aes_decryptor_ = false;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::MockCallback<CdmAttachedCB> set_cdm_cb_;
base::MockCallback<PipelineStatusCB> renderer_init_cb_;
NullMediaLog null_media_log_;
@@ -108,7 +108,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -126,7 +126,7 @@
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -144,7 +144,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -155,7 +155,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -173,7 +173,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -191,7 +191,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -209,7 +209,7 @@
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -227,7 +227,7 @@
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -245,7 +245,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
decrypting_renderer_->SetCdm(&cdm_context_, set_cdm_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(decrypting_renderer_->HasDecryptingMediaResourceForTesting());
}
@@ -259,7 +259,7 @@
decrypting_renderer_->Initialize(&media_resource_, &renderer_client_,
renderer_init_cb_.Get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Cause a PIPELINE_ERROR_INITIALIZATION_FAILED error to be passed as a
// parameter to the initialization callback.
diff --git a/media/renderers/paint_canvas_video_renderer_unittest.cc b/media/renderers/paint_canvas_video_renderer_unittest.cc
index e94736c..286bac7 100644
--- a/media/renderers/paint_canvas_video_renderer_unittest.cc
+++ b/media/renderers/paint_canvas_video_renderer_unittest.cc
@@ -384,7 +384,7 @@
SkBitmap bitmap_;
cc::SkiaPaintCanvas target_canvas_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(PaintCanvasVideoRendererTest);
};
diff --git a/media/renderers/renderer_impl_unittest.cc b/media/renderers/renderer_impl_unittest.cc
index 30b46649..705dd19b 100644
--- a/media/renderers/renderer_impl_unittest.cc
+++ b/media/renderers/renderer_impl_unittest.cc
@@ -82,7 +82,7 @@
video_renderer_(new StrictMock<MockVideoRenderer>()),
audio_renderer_(new StrictMock<MockAudioRenderer>()),
renderer_impl_(
- new RendererImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
+ new RendererImpl(task_environment_.GetMainThreadTaskRunner(),
std::unique_ptr<AudioRenderer>(audio_renderer_),
std::unique_ptr<VideoRenderer>(video_renderer_))),
cdm_context_(new StrictMock<MockCdmContext>()),
@@ -346,7 +346,7 @@
}
// Fixture members.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
StrictMock<CallbackHelper> callbacks_;
base::SimpleTestTickClock test_tick_clock_;
diff --git a/media/renderers/video_renderer_impl_unittest.cc b/media/renderers/video_renderer_impl_unittest.cc
index 3caab78..b09b6eee 100644
--- a/media/renderers/video_renderer_impl_unittest.cc
+++ b/media/renderers/video_renderer_impl_unittest.cc
@@ -304,7 +304,7 @@
MOCK_METHOD0(OnSimulateDecodeDelay, base::TimeDelta(void));
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
NullMediaLog media_log_;
// Fixture members.
diff --git a/media/renderers/video_resource_updater_unittest.cc b/media/renderers/video_resource_updater_unittest.cc
index 8e4edf88..f2cfd41 100644
--- a/media/renderers/video_resource_updater_unittest.cc
+++ b/media/renderers/video_resource_updater_unittest.cc
@@ -245,7 +245,7 @@
// VideoResourceUpdater registers as a MemoryDumpProvider, which requires
// a TaskRunner.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
UploadCounterGLES2Interface* gl_;
scoped_refptr<viz::TestContextProvider> context_provider_;
FakeSharedBitmapReporter shared_bitmap_reporter_;
diff --git a/media/test/pipeline_integration_fuzzertest.cc b/media/test/pipeline_integration_fuzzertest.cc
index 04b1c44..367e96e84 100644
--- a/media/test/pipeline_integration_fuzzertest.cc
+++ b/media/test/pipeline_integration_fuzzertest.cc
@@ -227,7 +227,7 @@
Environment() {
base::CommandLine::Init(0, nullptr);
- // |test| instances uses ScopedTaskEnvironment, which needs TestTimeouts.
+ // |test| instances uses TaskEnvironment, which needs TestTimeouts.
TestTimeouts::Initialize();
media::InitializeMediaLibrary();
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index be371b36b..4ba43f1 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -1627,7 +1627,7 @@
source.RemoveRange(base::TimeDelta::FromMilliseconds(1000),
base::TimeDelta::FromMilliseconds(k320WebMFileDurationMs));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
buffered_ranges = pipeline_->GetBufferedTimeRanges();
EXPECT_EQ(1u, buffered_ranges.size());
@@ -1662,7 +1662,7 @@
// reached (the data will be evicted from the front of the buffered range).
source.EvictCodedFrames(media_time, file->data_size());
source.AppendAtTime(media_time, file->data(), file->data_size());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
buffered_ranges = pipeline_->GetBufferedTimeRanges();
} while (buffered_ranges.size() == 1 &&
diff --git a/media/test/pipeline_integration_test_base.cc b/media/test/pipeline_integration_test_base.cc
index 109e4b6..654720f 100644
--- a/media/test/pipeline_integration_test_base.cc
+++ b/media/test/pipeline_integration_test_base.cc
@@ -133,10 +133,9 @@
webaudio_attached_(false),
mono_output_(false),
fuzzing_(false),
- pipeline_(
- new PipelineImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- &media_log_)),
+ pipeline_(new PipelineImpl(task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
+ &media_log_)),
ended_(false),
pipeline_status_(PIPELINE_OK),
last_video_frame_format_(PIXEL_FORMAT_UNKNOWN),
@@ -229,7 +228,7 @@
base::RunLoop run_loop;
RunUntilQuitOrEndedOrError(&run_loop);
} else {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
return pipeline_status_;
}
@@ -417,7 +416,7 @@
return;
}
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&PipelineIntegrationTestBase::QuitAfterCurrentTimeTask,
base::Unretained(this), quit_time,
@@ -432,7 +431,7 @@
DCHECK(wait_time <= pipeline_->GetMediaDuration());
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&PipelineIntegrationTestBase::QuitAfterCurrentTimeTask,
base::Unretained(this), wait_time,
@@ -450,7 +449,7 @@
#if BUILDFLAG(ENABLE_FFMPEG)
demuxer_ = std::unique_ptr<Demuxer>(new FFmpegDemuxer(
- scoped_task_environment_.GetMainThreadTaskRunner(), data_source_.get(),
+ task_environment_.GetMainThreadTaskRunner(), data_source_.get(),
base::BindRepeating(
&PipelineIntegrationTestBase::DemuxerEncryptedMediaInitDataCB,
base::Unretained(this)),
@@ -468,11 +467,11 @@
clockless_playback_, base::TimeDelta::FromSecondsD(1.0 / 60),
base::Bind(&PipelineIntegrationTestBase::OnVideoFramePaint,
base::Unretained(this)),
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
// Disable frame dropping if hashing is enabled.
std::unique_ptr<VideoRenderer> video_renderer(new VideoRendererImpl(
- scoped_task_environment_.GetMainThreadTaskRunner(), video_sink_.get(),
+ task_environment_.GetMainThreadTaskRunner(), video_sink_.get(),
base::Bind(&CreateVideoDecodersForTest, &media_log_,
prepend_video_decoders_cb),
false, &media_log_, nullptr));
@@ -481,7 +480,7 @@
DCHECK(!mono_output_) << " NullAudioSink doesn't specify output parameters";
audio_sink_ =
- new NullAudioSink(scoped_task_environment_.GetMainThreadTaskRunner());
+ new NullAudioSink(task_environment_.GetMainThreadTaskRunner());
} else {
ChannelLayout output_layout =
mono_output_ ? CHANNEL_LAYOUT_MONO : CHANNEL_LAYOUT_STEREO;
@@ -501,12 +500,12 @@
}
std::unique_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
(clockless_playback_)
? static_cast<AudioRendererSink*>(clockless_audio_sink_.get())
: audio_sink_.get(),
base::Bind(&CreateAudioDecodersForTest, &media_log_,
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
prepend_audio_decoders_cb),
&media_log_));
if (hashing_enabled_) {
@@ -520,7 +519,7 @@
->SetPlayDelayCBForTesting(std::move(audio_play_delay_cb_));
std::unique_ptr<RendererImpl> renderer_impl(
- new RendererImpl(scoped_task_environment_.GetMainThreadTaskRunner(),
+ new RendererImpl(task_environment_.GetMainThreadTaskRunner(),
std::move(audio_renderer), std::move(video_renderer)));
// Prevent non-deterministic buffering state callbacks from firing (e.g., slow
@@ -673,7 +672,7 @@
run_loop->Run();
on_ended_closure_ = base::OnceClosure();
on_error_closure_ = base::OnceClosure();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void PipelineIntegrationTestBase::RunUntilQuitOrEndedOrError(
diff --git a/media/test/pipeline_integration_test_base.h b/media/test/pipeline_integration_test_base.h
index 1b43eb4e..f514cec3 100644
--- a/media/test/pipeline_integration_test_base.h
+++ b/media/test/pipeline_integration_test_base.h
@@ -151,7 +151,7 @@
protected:
NiceMock<MockMediaLog> media_log_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::MD5Context md5_context_;
bool hashing_enabled_;
bool clockless_playback_;
@@ -249,7 +249,7 @@
private:
// Runs |run_loop| until it is explicitly Quit() by some part of the calling
// test fixture or when an error occurs (by setting |on_error_closure_|). The
- // |scoped_task_environment_| is RunUntilIdle() after the RunLoop finishes
+ // |task_environment_| is RunUntilIdle() after the RunLoop finishes
// running, before returning to the caller.
void RunUntilQuitOrError(base::RunLoop* run_loop);
diff --git a/media/webrtc/audio_processor_unittest.cc b/media/webrtc/audio_processor_unittest.cc
index 31d5d1e..bf244d9f 100644
--- a/media/webrtc/audio_processor_unittest.cc
+++ b/media/webrtc/audio_processor_unittest.cc
@@ -152,7 +152,7 @@
return settings;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
media::AudioParameters params_;
};
diff --git a/mojo/core/data_pipe_unittest.cc b/mojo/core/data_pipe_unittest.cc
index a4675079..c034dc7 100644
--- a/mojo/core/data_pipe_unittest.cc
+++ b/mojo/core/data_pipe_unittest.cc
@@ -1986,7 +1986,7 @@
EXPECT_EQ(MOJO_RESULT_OK,
WaitForSignals(consumers[0], MOJO_HANDLE_SIGNAL_PEER_CLOSED));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
// Wait on producer 1 and consumer 1 using SimpleWatchers.
{
diff --git a/mojo/core/invitation_unittest.cc b/mojo/core/invitation_unittest.cc
index 674a4fe8..9cb4245 100644
--- a/mojo/core/invitation_unittest.cc
+++ b/mojo/core/invitation_unittest.cc
@@ -66,7 +66,7 @@
base::StringPiece isolated_invitation_name);
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(InvitationTest);
};
diff --git a/mojo/core/multiprocess_message_pipe_unittest.cc b/mojo/core/multiprocess_message_pipe_unittest.cc
index 60332c07..1df06fe 100644
--- a/mojo/core/multiprocess_message_pipe_unittest.cc
+++ b/mojo/core/multiprocess_message_pipe_unittest.cc
@@ -1274,7 +1274,7 @@
EXPECT_EQ(MOJO_RESULT_OK,
WaitForSignals(handles[0], MOJO_HANDLE_SIGNAL_PEER_CLOSED));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
// Wait on handle 1 using a SimpleWatcher.
{
diff --git a/mojo/core/ports/ports_unittest.cc b/mojo/core/ports/ports_unittest.cc
index 40c278b..fbacc61 100644
--- a/mojo/core/ports/ports_unittest.cc
+++ b/mojo/core/ports/ports_unittest.cc
@@ -423,7 +423,7 @@
}
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Acquired before any operation which makes a Node busy, and before testing
// if all nodes are idle.
diff --git a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
index 5387831..58684fa0 100644
--- a/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/associated_interface_unittest.cc
@@ -137,7 +137,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
scoped_refptr<base::SequencedTaskRunner> main_runner_;
};
diff --git a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
index fb7f778..098f2098 100644
--- a/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/bind_task_runner_unittest.cc
@@ -197,7 +197,7 @@
impl_.reset(new ImplType(std::move(receiver), receiver_task_runner_));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<TestTaskRunner> receiver_task_runner_;
scoped_refptr<TestTaskRunner> remote_task_runner_;
@@ -235,7 +235,7 @@
void QuitTaskRunner() { connection_receiver_task_runner_->Quit(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<TestTaskRunner> connection_receiver_task_runner_;
scoped_refptr<TestTaskRunner> connection_remote_task_runner_;
scoped_refptr<TestTaskRunner> sender_receiver_task_runner_;
diff --git a/mojo/public/cpp/bindings/tests/bindings_perftest.cc b/mojo/public/cpp/bindings/tests/bindings_perftest.cc
index be70f08e..e6f2c917 100644
--- a/mojo/public/cpp/bindings/tests/bindings_perftest.cc
+++ b/mojo/public/cpp/bindings/tests/bindings_perftest.cc
@@ -93,7 +93,7 @@
MojoBindingsPerftest() = default;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(MojoBindingsPerftest, InProcessPingPong) {
diff --git a/mojo/public/cpp/bindings/tests/bindings_test_base.h b/mojo/public/cpp/bindings/tests/bindings_test_base.h
index 32ddca1..9b03605 100644
--- a/mojo/public/cpp/bindings/tests/bindings_test_base.h
+++ b/mojo/public/cpp/bindings/tests/bindings_test_base.h
@@ -35,7 +35,7 @@
static void SetupSerializationBehavior(BindingsTestSerializationMode mode);
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
} // namespace mojo
diff --git a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
index fcba7cf..77a66201 100644
--- a/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connection_group_unittest.cc
@@ -24,7 +24,7 @@
ConnectionGroupTest() = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ConnectionGroupTest);
};
diff --git a/mojo/public/cpp/bindings/tests/connector_unittest.cc b/mojo/public/cpp/bindings/tests/connector_unittest.cc
index b4e4438..b34367ec 100644
--- a/mojo/public/cpp/bindings/tests/connector_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/connector_unittest.cc
@@ -109,7 +109,7 @@
ScopedMessagePipeHandle handle1_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(ConnectorTest, Basic) {
diff --git a/mojo/public/cpp/bindings/tests/data_view_unittest.cc b/mojo/public/cpp/bindings/tests/data_view_unittest.cc
index 99c860f..e908440 100644
--- a/mojo/public/cpp/bindings/tests/data_view_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/data_view_unittest.cc
@@ -23,7 +23,7 @@
class DataViewTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
struct DataViewHolder {
diff --git a/mojo/public/cpp/bindings/tests/e2e_perftest.cc b/mojo/public/cpp/bindings/tests/e2e_perftest.cc
index 7c7d600..84505328 100644
--- a/mojo/public/cpp/bindings/tests/e2e_perftest.cc
+++ b/mojo/public/cpp/bindings/tests/e2e_perftest.cc
@@ -130,7 +130,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
void RunTests(MojoHandle client_mp, const std::string& test_name) {
@@ -175,8 +175,8 @@
base::BindOnce(
&CreateAndRunService, std::move(receiver),
base::BindOnce(base::IgnoreResult(&base::TaskRunner::PostTask),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- FROM_HERE, run_loop.QuitClosure())));
+ task_environment_.GetMainThreadTaskRunner(), FROM_HERE,
+ run_loop.QuitClosure())));
run_loop.Run();
}
@@ -185,9 +185,8 @@
MojoHandle client_mp, service_mp;
CreateMessagePipe(&client_mp, &service_mp);
WriteMessageWithHandles(mp, "hello", &service_mp, 1);
- RunTestOnTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner().get(), client_mp,
- "MultiProcessEchoMainThread");
+ RunTestOnTaskRunner(task_environment_.GetMainThreadTaskRunner().get(),
+ client_mp, "MultiProcessEchoMainThread");
});
}
diff --git a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
index 424e47d23..9a47e79 100644
--- a/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/lazy_serialization_unittest.cc
@@ -22,7 +22,7 @@
~LazySerializationTest() override = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(LazySerializationTest);
};
diff --git a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
index 7da9906..d4cc81d 100644
--- a/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/multiplex_router_unittest.cc
@@ -61,7 +61,7 @@
ScopedInterfaceEndpointHandle endpoint1_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(MultiplexRouterTest, BasicRequestResponse) {
diff --git a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
index d421da9c..a293e16 100644
--- a/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/new_endpoint_types_unittest.cc
@@ -179,7 +179,7 @@
// demonstrate look & feel as well as to ensure basic completeness and
// correctness.
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
// A Remote<T> exposes a callable T interface which sends messages to a remote
// implementation of T. Here we create a new unbound Remote which will control
@@ -263,7 +263,7 @@
}
TEST(NewEndpointTypesTest, AssociatedTypes) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
mojo::Remote<mojom::AssociatedPingerHost> host;
AssociatedPingerHostImpl host_impl(host.BindNewPipeAndPassReceiver());
diff --git a/mojo/public/cpp/bindings/tests/pickle_unittest.cc b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
index d3015d2..6c4b753 100644
--- a/mojo/public/cpp/bindings/tests/pickle_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/pickle_unittest.cc
@@ -191,7 +191,7 @@
};
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ChromiumPicklePasserImpl chromium_service_;
ReceiverSet<PicklePasser> chromium_receivers_;
BlinkPicklePasserImpl blink_service_;
diff --git a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
index 5a4200e..ff0260cb 100644
--- a/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/receiver_callback_unittest.cc
@@ -109,7 +109,7 @@
void PumpMessages() { base::RunLoop().RunUntilIdle(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Tests that the Remote and the Receiver can communicate with each other
diff --git a/mojo/public/cpp/bindings/tests/remote_unittest.cc b/mojo/public/cpp/bindings/tests/remote_unittest.cc
index 41ad249..0f80ebe 100644
--- a/mojo/public/cpp/bindings/tests/remote_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/remote_unittest.cc
@@ -502,7 +502,7 @@
};
TEST(StrongConnectorTest, Math) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
bool disconnected = false;
bool destroyed = false;
@@ -578,7 +578,7 @@
};
TEST(WeakConnectorTest, Math) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
bool disconnected = false;
bool destroyed = false;
diff --git a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
index 98f4e37..bd0c5915 100644
--- a/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/service_factory_unittest.cc
@@ -25,7 +25,7 @@
ServiceFactoryTest() = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ServiceFactoryTest);
};
diff --git a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
index 2ae29a9..3de4a01 100644
--- a/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/struct_traits_unittest.cc
@@ -188,7 +188,7 @@
std::move(callback).Run(std::move(u));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ChromiumRectServiceImpl chromium_service_;
ReceiverSet<RectService> chromium_receivers_;
diff --git a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
index cea8f73d..ad2f16e 100644
--- a/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/sync_method_unittest.cc
@@ -295,7 +295,7 @@
~SyncMethodTest() override = default;
protected:
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
};
template <typename TypeParam>
@@ -409,7 +409,7 @@
// so gtest can instantiate copies for each |TypeParam|.
template <typename TypeParam>
class SequencedTaskRunnerTestLauncher : public testing::Test {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
};
// Similar to SyncMethodCommonTest, but the test body runs on a
diff --git a/mojo/public/cpp/bindings/tests/test_helpers_unittest.cc b/mojo/public/cpp/bindings/tests/test_helpers_unittest.cc
index 8cbdaaf..17dcc45 100644
--- a/mojo/public/cpp/bindings/tests/test_helpers_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/test_helpers_unittest.cc
@@ -21,7 +21,7 @@
~TestHelperTest() override = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(TestHelperTest);
};
diff --git a/mojo/public/cpp/bindings/tests/union_unittest.cc b/mojo/public/cpp/bindings/tests/union_unittest.cc
index 9d5406f..d11ee8e 100644
--- a/mojo/public/cpp/bindings/tests/union_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/union_unittest.cc
@@ -1148,7 +1148,7 @@
};
TEST(UnionTest, InterfaceInUnion) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
SmallCacheImpl impl(run_loop.QuitClosure());
Remote<SmallCache> remote;
@@ -1164,7 +1164,7 @@
}
TEST(UnionTest, InterfaceInUnionFactoryFunction) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
SmallCacheImpl impl(run_loop.QuitClosure());
Remote<SmallCache> remote;
@@ -1178,7 +1178,7 @@
}
TEST(UnionTest, InterfaceInUnionSerialization) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
SmallCacheImpl impl(run_loop.QuitClosure());
Remote<SmallCache> remote;
@@ -1215,7 +1215,7 @@
};
TEST(UnionTest, UnionInInterface) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
UnionInterfaceImpl impl;
Remote<UnionInterface> remote;
Receiver<UnionInterface> receiver(&impl, remote.BindNewPipeAndPassReceiver());
diff --git a/mojo/public/cpp/bindings/tests/validation_unittest.cc b/mojo/public/cpp/bindings/tests/validation_unittest.cc
index 4809df9..f59a335 100644
--- a/mojo/public/cpp/bindings/tests/validation_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/validation_unittest.cc
@@ -220,7 +220,7 @@
ValidationTest() {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
class ValidationIntegrationTest : public ValidationTest {
diff --git a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
index 770b8c85..8a78dce2 100644
--- a/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
+++ b/mojo/public/cpp/bindings/tests/wtf_types_unittest.cc
@@ -59,7 +59,7 @@
WTFTypesTest() {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
WTF::Vector<WTF::String> ConstructStringArray() {
diff --git a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
index b1f97d79..c35d50f 100644
--- a/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
+++ b/mojo/public/cpp/system/tests/data_pipe_drainer_unittest.cc
@@ -37,7 +37,7 @@
void OnDataComplete() override { completion_callback_.Run(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::string data_;
std::unique_ptr<DataPipeDrainer> drainer_;
diff --git a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
index 79a883b..74028b9 100644
--- a/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
+++ b/mojo/public/cpp/system/tests/data_pipe_producer_unittest.cc
@@ -132,7 +132,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir temp_dir_;
int tmp_file_id_ = 0;
diff --git a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
index 6e0f1b8..bbdd343 100644
--- a/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
+++ b/mojo/public/cpp/system/tests/handle_signal_tracker_unittest.cc
@@ -33,7 +33,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(HandleSignalTrackerTest);
};
diff --git a/mojo/public/cpp/system/tests/invitation_unittest.cc b/mojo/public/cpp/system/tests/invitation_unittest.cc
index 138751d..93f12f5 100644
--- a/mojo/public/cpp/system/tests/invitation_unittest.cc
+++ b/mojo/public/cpp/system/tests/invitation_unittest.cc
@@ -172,7 +172,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::Process child_process_;
DISALLOW_COPY_AND_ASSIGN(InvitationCppTest);
@@ -264,7 +264,7 @@
}
TEST(InvitationCppTest_NoParam, SendIsolatedInvitationWithDuplicateName) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
PlatformChannel channel1;
PlatformChannel channel2;
const char kConnectionName[] = "foo";
diff --git a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
index 562ef221..160b93d 100644
--- a/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
+++ b/mojo/public/cpp/system/tests/scope_to_message_pipe_unittest.cc
@@ -34,7 +34,7 @@
~ScopeToMessagePipeTest() override = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ScopeToMessagePipeTest);
};
diff --git a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
index c2e0fed2..b624b9e 100644
--- a/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
+++ b/mojo/public/cpp/system/tests/simple_watcher_unittest.cc
@@ -40,7 +40,7 @@
~SimpleWatcherTest() override {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(SimpleWatcherTest);
};
diff --git a/mojo/public/cpp/system/tests/string_data_source_unittest.cc b/mojo/public/cpp/system/tests/string_data_source_unittest.cc
index c18e92c..be0603a0 100644
--- a/mojo/public/cpp/system/tests/string_data_source_unittest.cc
+++ b/mojo/public/cpp/system/tests/string_data_source_unittest.cc
@@ -126,7 +126,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(StringDataSourceTest);
};
diff --git a/ppapi/host/resource_message_filter_unittest.cc b/ppapi/host/resource_message_filter_unittest.cc
index c0abd5f..5612679 100644
--- a/ppapi/host/resource_message_filter_unittest.cc
+++ b/ppapi/host/resource_message_filter_unittest.cc
@@ -212,11 +212,11 @@
// ResourceMessageFilter instances need to be created on a thread with message
// loop. Therefore, we create a message loop and run the testing logic as a
// task on it.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
// It should be safe to use base::Unretained() because the object won't be
// destroyed before the task is run.
- scoped_task_environment.GetMainThreadTaskRunner()->PostTask(
+ task_environment.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&ResourceMessageFilterTest::TestHandleMessageImpl,
base::Unretained(this)));
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index 3f39598..1ee5eb7a 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -202,7 +202,7 @@
virtual void SetUp();
virtual void TearDown();
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// This class provides support for multi-thread testing. A secondary thread is
@@ -334,7 +334,7 @@
virtual void SetUp();
virtual void TearDown();
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Use this base class to test both sides of a proxy.
@@ -372,7 +372,7 @@
// The plugin side of the proxy runs on its own thread.
base::Thread plugin_thread_;
// The message loop for the main (host) thread.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Aliases for the host and plugin harnesses; if we're testing a PPP
// interface, remote_harness will point to plugin_, and local_harness
diff --git a/ppapi/proxy/raw_var_data_unittest.cc b/ppapi/proxy/raw_var_data_unittest.cc
index 59c56641..486ec00 100644
--- a/ppapi/proxy/raw_var_data_unittest.cc
+++ b/ppapi/proxy/raw_var_data_unittest.cc
@@ -52,8 +52,8 @@
}
private:
- base::test::ScopedTaskEnvironment
- scoped_task_environment_; // Required to receive callbacks.
+ base::test::TaskEnvironment
+ task_environment_; // Required to receive callbacks.
TestGlobals globals_;
};
diff --git a/ppapi/shared_impl/proxy_lock_unittest.cc b/ppapi/shared_impl/proxy_lock_unittest.cc
index 980bfe4..c0d0068 100644
--- a/ppapi/shared_impl/proxy_lock_unittest.cc
+++ b/ppapi/shared_impl/proxy_lock_unittest.cc
@@ -68,8 +68,8 @@
} // namespace
class PpapiProxyLockTest : public testing::Test {
- base::test::ScopedTaskEnvironment
- scoped_task_environment_; // Required to receive callbacks.
+ base::test::TaskEnvironment
+ task_environment_; // Required to receive callbacks.
};
TEST_F(PpapiProxyLockTest, Locking) {
diff --git a/ppapi/shared_impl/resource_tracker_unittest.cc b/ppapi/shared_impl/resource_tracker_unittest.cc
index 4044882..3bacc40 100644
--- a/ppapi/shared_impl/resource_tracker_unittest.cc
+++ b/ppapi/shared_impl/resource_tracker_unittest.cc
@@ -49,8 +49,8 @@
ResourceTracker& resource_tracker() { return *globals_.GetResourceTracker(); }
private:
- base::test::ScopedTaskEnvironment
- scoped_task_environment_; // Required to receive callbacks.
+ base::test::TaskEnvironment
+ task_environment_; // Required to receive callbacks.
TestGlobals globals_;
};
diff --git a/ppapi/shared_impl/var_tracker_unittest.cc b/ppapi/shared_impl/var_tracker_unittest.cc
index a31053f..5db7841f 100644
--- a/ppapi/shared_impl/var_tracker_unittest.cc
+++ b/ppapi/shared_impl/var_tracker_unittest.cc
@@ -49,8 +49,8 @@
VarTracker& var_tracker() { return *globals_.GetVarTracker(); }
private:
- base::test::ScopedTaskEnvironment
- scoped_task_environment_; // Required to receive callbacks.
+ base::test::TaskEnvironment
+ task_environment_; // Required to receive callbacks.
TestGlobals globals_;
};
diff --git a/printing/printing_context_win_unittest.cc b/printing/printing_context_win_unittest.cc
index 2c6bfa516..277a2ba 100644
--- a/printing/printing_context_win_unittest.cc
+++ b/printing/printing_context_win_unittest.cc
@@ -147,7 +147,7 @@
if (IsTestCaseDisabled())
return;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
MockPrintingContextWin context(this);
context.AskUserForSettings(
123, false, false,
@@ -162,7 +162,7 @@
if (IsTestCaseDisabled())
return;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
MockPrintingContextWin context(this);
context.AskUserForSettings(
123, false, false,
diff --git a/remoting/base/auto_thread_task_runner_unittest.cc b/remoting/base/auto_thread_task_runner_unittest.cc
index 2e6d02d..f5a9b58 100644
--- a/remoting/base/auto_thread_task_runner_unittest.cc
+++ b/remoting/base/auto_thread_task_runner_unittest.cc
@@ -23,15 +23,14 @@
TEST(AutoThreadTaskRunnerTest, StartAndStop) {
// Create a task runner.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
scoped_refptr<AutoThreadTaskRunner> task_runner = new AutoThreadTaskRunner(
- scoped_task_environment.GetMainThreadTaskRunner(),
- run_loop.QuitClosure());
+ task_environment.GetMainThreadTaskRunner(), run_loop.QuitClosure());
// Post a task to make sure it is executed.
bool success = false;
- scoped_task_environment.GetMainThreadTaskRunner()->PostTask(
+ task_environment.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&SetFlagTask, &success));
task_runner = NULL;
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc
index 39504c1..408cd474 100644
--- a/remoting/base/auto_thread_unittest.cc
+++ b/remoting/base/auto_thread_unittest.cc
@@ -57,20 +57,20 @@
class AutoThreadTest : public testing::Test {
public:
void RunMessageLoop() {
- // Release |main_task_runner_|, then run |scoped_task_environment_| until
+ // Release |main_task_runner_|, then run |task_environment_| until
// other references created in tests are gone. We also post a delayed quit
// task to |message_loop_| so the test will not hang on failure.
main_task_runner_ = NULL;
base::RunLoop run_loop;
quit_closure_ = run_loop.QuitClosure();
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromSeconds(5));
run_loop.Run();
}
void SetUp() override {
main_task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::Bind(&AutoThreadTest::QuitMainMessageLoop,
base::Unretained(this)));
}
@@ -83,7 +83,7 @@
protected:
void QuitMainMessageLoop() { std::move(quit_closure_).Run(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::OnceClosure quit_closure_;
scoped_refptr<AutoThreadTaskRunner> main_task_runner_;
};
diff --git a/remoting/base/buffered_socket_writer_unittest.cc b/remoting/base/buffered_socket_writer_unittest.cc
index 64aed4f..94b0f2a 100644
--- a/remoting/base/buffered_socket_writer_unittest.cc
+++ b/remoting/base/buffered_socket_writer_unittest.cc
@@ -158,7 +158,7 @@
VerifyWrittenData();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::NetLog net_log_;
SocketDataProvider socket_data_provider_;
std::unique_ptr<net::StreamSocket> socket_;
diff --git a/remoting/base/grpc_support/grpc_async_executor_unittest.cc b/remoting/base/grpc_support/grpc_async_executor_unittest.cc
index 469b46a4..93946ee 100644
--- a/remoting/base/grpc_support/grpc_async_executor_unittest.cc
+++ b/remoting/base/grpc_support/grpc_async_executor_unittest.cc
@@ -100,12 +100,11 @@
std::unique_ptr<GrpcAsyncExecutor> executor_;
std::unique_ptr<test::GrpcAsyncTestServer> server_;
std::unique_ptr<GrpcAsyncExecutorTestService::Stub> stub_;
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
};
void GrpcAsyncExecutorTest::SetUp() {
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>();
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>();
executor_ = std::make_unique<GrpcAsyncExecutor>();
server_ = std::make_unique<test::GrpcAsyncTestServer>(
std::make_unique<GrpcAsyncExecutorTestService::AsyncService>());
@@ -629,11 +628,10 @@
ServerStreamInitialMetadataDeadline_DefaultDeadline) {
// Other tests can't work with mock time so we have to replace it here.
// We also have to reset the old task environment before creating a new one
- // since only one ScopedTaskEnvironment can exist at a time.
- scoped_task_environment_.reset();
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ // since only one TaskEnvironment can exist at a time.
+ task_environment_.reset();
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
MockOnceClosure on_channel_ready;
MockMessageCallback on_incoming_message;
@@ -643,15 +641,14 @@
on_incoming_message.Get(), on_status.Get());
EXPECT_CALL(on_status, Run(Property(&grpc::Status::error_code,
grpc::StatusCode::DEADLINE_EXCEEDED)));
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
}
TEST_F(GrpcAsyncExecutorTest,
ServerStreamInitialMetadataDeadline_ManualDeadline) {
- scoped_task_environment_.reset();
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ task_environment_.reset();
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
MockOnceClosure on_channel_ready;
MockMessageCallback on_incoming_message;
@@ -662,13 +659,13 @@
base::Time::Now() + base::TimeDelta::FromSeconds(60));
// |on_status| shouldn't be called in the first 30 seconds.
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
EXPECT_CALL(on_status, Run(Property(&grpc::Status::error_code,
grpc::StatusCode::DEADLINE_EXCEEDED)));
// |on_status| should be called here.
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(30));
}
} // namespace remoting
diff --git a/remoting/base/grpc_support/grpc_authenticated_executor_unittest.cc b/remoting/base/grpc_support/grpc_authenticated_executor_unittest.cc
index 2ad8fac3..d9c8aaa 100644
--- a/remoting/base/grpc_support/grpc_authenticated_executor_unittest.cc
+++ b/remoting/base/grpc_support/grpc_authenticated_executor_unittest.cc
@@ -53,7 +53,7 @@
private:
FakeOAuthTokenGetter token_getter_{OAuthTokenGetter::Status::SUCCESS,
"fake_user", "fake_token"};
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
void GrpcAuthenticatedExecutorTest::SetUp() {
diff --git a/remoting/base/oauth_token_getter_proxy_unittest.cc b/remoting/base/oauth_token_getter_proxy_unittest.cc
index 5c61ae8..498dc91 100644
--- a/remoting/base/oauth_token_getter_proxy_unittest.cc
+++ b/remoting/base/oauth_token_getter_proxy_unittest.cc
@@ -135,7 +135,7 @@
std::unique_ptr<TokenCallbackResult> expected_callback_result_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(OAuthTokenGetterProxyTest);
};
diff --git a/remoting/base/telemetry_log_writer_unittest.cc b/remoting/base/telemetry_log_writer_unittest.cc
index e4ea612..0401f9f 100644
--- a/remoting/base/telemetry_log_writer_unittest.cc
+++ b/remoting/base/telemetry_log_writer_unittest.cc
@@ -139,7 +139,7 @@
private:
int id_ = 0;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Test workflow: add request -> log event -> respond request.
diff --git a/remoting/client/display/gl_renderer_unittest.cc b/remoting/client/display/gl_renderer_unittest.cc
index 03245536..3ccd78f 100644
--- a/remoting/client/display/gl_renderer_unittest.cc
+++ b/remoting/client/display/gl_renderer_unittest.cc
@@ -125,7 +125,7 @@
return on_desktop_frame_processed_call_count_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<GlRenderer> renderer_;
FakeGlRendererDelegate delegate_;
@@ -160,7 +160,7 @@
void GlRendererTest::PostSetDesktopFrameTasks(const webrtc::DesktopSize& size,
int count) {
for (int i = 0; i < count; i++) {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&GlRendererTest::SetDesktopFrameWithSize,
base::Unretained(this), size));
}
@@ -172,8 +172,8 @@
void GlRendererTest::RunTasksInCurrentQueue() {
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
- FROM_HERE, run_loop.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner()->PostTask(FROM_HERE,
+ run_loop.QuitClosure());
run_loop.Run();
}
diff --git a/remoting/client/queued_task_poster_unittest.cc b/remoting/client/queued_task_poster_unittest.cc
index 67acf16f..fcbadfb 100644
--- a/remoting/client/queued_task_poster_unittest.cc
+++ b/remoting/client/queued_task_poster_unittest.cc
@@ -42,7 +42,7 @@
void AssertSequenceNotStarted();
base::Thread target_thread_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool sequence_started_ = false;
};
diff --git a/remoting/client/software_video_renderer_unittest.cc b/remoting/client/software_video_renderer_unittest.cc
index a75a045..2f7854b6 100644
--- a/remoting/client/software_video_renderer_unittest.cc
+++ b/remoting/client/software_video_renderer_unittest.cc
@@ -143,7 +143,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ClientContext context_;
TestFrameConsumer frame_consumer_;
diff --git a/remoting/host/chromeos/clipboard_aura_unittest.cc b/remoting/host/chromeos/clipboard_aura_unittest.cc
index d1616ae..f72564d 100644
--- a/remoting/host/chromeos/clipboard_aura_unittest.cc
+++ b/remoting/host/chromeos/clipboard_aura_unittest.cc
@@ -56,8 +56,8 @@
protected:
void StopAndResetClipboard();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
ClientClipboard* client_clipboard_;
std::unique_ptr<ClipboardAura> clipboard_;
};
@@ -119,13 +119,13 @@
Eq("Test data.")))).Times(1);
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE,
base::BindOnce(&ClipboardAuraTest_MonitorClipboardChanges_Test::
StopAndResetClipboard,
base::Unretained(this)),
TestTimeouts::tiny_timeout());
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(), TestTimeouts::tiny_timeout());
run_loop.Run();
}
diff --git a/remoting/host/chromoting_host_context_unittest.cc b/remoting/host/chromoting_host_context_unittest.cc
index 9f0bd83..8eb63077 100644
--- a/remoting/host/chromoting_host_context_unittest.cc
+++ b/remoting/host/chromoting_host_context_unittest.cc
@@ -14,14 +14,13 @@
// A simple test that starts and stop the context. This tests the context
// operates properly and all threads and message loops are valid.
TEST(ChromotingHostContextTest, StartAndStop) {
- base::test::ScopedTaskEnvironment scoped_task_environment{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::RunLoop run_loop;
std::unique_ptr<ChromotingHostContext> context =
ChromotingHostContext::Create(new AutoThreadTaskRunner(
- scoped_task_environment.GetMainThreadTaskRunner(),
- run_loop.QuitClosure()));
+ task_environment.GetMainThreadTaskRunner(), run_loop.QuitClosure()));
EXPECT_TRUE(context);
if (!context)
diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc
index df0d8a3..082be37 100644
--- a/remoting/host/chromoting_host_unittest.cc
+++ b/remoting/host/chromoting_host_unittest.cc
@@ -210,7 +210,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
scoped_refptr<AutoThreadTaskRunner> task_runner_;
MockConnectionToClientEventHandler handler_;
diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc
index c813625..84cddeb0 100644
--- a/remoting/host/client_session_unittest.cc
+++ b/remoting/host/client_session_unittest.cc
@@ -188,7 +188,7 @@
int curr_display_;
// Message loop that will process all ClientSession tasks.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// AutoThreadTaskRunner on which |client_session_| will be run.
scoped_refptr<AutoThreadTaskRunner> task_runner_;
@@ -219,13 +219,12 @@
};
void ClientSessionTest::SetUp() {
- // Arrange to run |scoped_task_environment_| until no components depend on it.
+ // Arrange to run |task_environment_| until no components depend on it.
task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner(), run_loop_.QuitClosure());
desktop_environment_factory_.reset(new FakeDesktopEnvironmentFactory(
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner()));
desktop_environment_options_ = DesktopEnvironmentOptions::CreateDefault();
}
diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc
index b009aca5..6af0439 100644
--- a/remoting/host/config_file_watcher_unittest.cc
+++ b/remoting/host/config_file_watcher_unittest.cc
@@ -52,8 +52,8 @@
void StopWatcher();
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::RunLoop run_loop_;
ConfigFileWatcherDelegate delegate_;
@@ -78,8 +78,7 @@
// Arrange to run |message_loop_| until no components depend on it.
scoped_refptr<AutoThreadTaskRunner> task_runner = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner(), run_loop_.QuitClosure());
scoped_refptr<AutoThreadTaskRunner> io_task_runner =
AutoThread::CreateWithType("IPC thread", task_runner,
diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc
index 6e846aa5..8d451cb9 100644
--- a/remoting/host/daemon_process_unittest.cc
+++ b/remoting/host/daemon_process_unittest.cc
@@ -151,8 +151,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<MockDaemonProcess> daemon_process_;
int terminal_id_;
@@ -165,7 +165,7 @@
void DaemonProcessTest::SetUp() {
scoped_refptr<AutoThreadTaskRunner> task_runner = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::Bind(&DaemonProcessTest::QuitMessageLoop, base::Unretained(this)));
daemon_process_.reset(
new MockDaemonProcess(task_runner, task_runner,
@@ -210,7 +210,7 @@
}
void DaemonProcessTest::QuitMessageLoop() {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
}
@@ -392,7 +392,7 @@
}));
static_cast<WorkerProcessIpcDelegate*>(daemon_process_.get())
->OnWorkerProcessStopped();
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromMilliseconds(10));
run_loop.Run();
}
diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc
index f845e46..dd6185a6 100644
--- a/remoting/host/desktop_process_unittest.cc
+++ b/remoting/host/desktop_process_unittest.cc
@@ -153,8 +153,8 @@
MockDaemonListener daemon_listener_;
// Runs the daemon's end of the channel.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
scoped_refptr<AutoThreadTaskRunner> io_task_runner_;
@@ -229,7 +229,7 @@
}
void DesktopProcessTest::PostDisconnectChannels() {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&DesktopProcessTest::DisconnectChannels,
base::Unretained(this)));
}
@@ -238,10 +238,10 @@
base::RunLoop run_loop;
base::Closure quit_ui_task_runner =
base::Bind(base::IgnoreResult(&base::SingleThreadTaskRunner::PostTask),
- scoped_task_environment_.GetMainThreadTaskRunner(), FROM_HERE,
+ task_environment_.GetMainThreadTaskRunner(), FROM_HERE,
run_loop.QuitClosure());
scoped_refptr<AutoThreadTaskRunner> ui_task_runner = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(), quit_ui_task_runner);
+ task_environment_.GetMainThreadTaskRunner(), quit_ui_task_runner);
io_task_runner_ = AutoThread::CreateWithType("IPC thread", ui_task_runner,
base::MessagePumpType::IO);
diff --git a/remoting/host/desktop_session_agent_unittest.cc b/remoting/host/desktop_session_agent_unittest.cc
index bb5ffc2..f83a7d9f 100644
--- a/remoting/host/desktop_session_agent_unittest.cc
+++ b/remoting/host/desktop_session_agent_unittest.cc
@@ -93,16 +93,16 @@
void Shutdown();
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
scoped_refptr<AutoThreadTaskRunner> task_runner_;
scoped_refptr<DesktopSessionAgent> agent_;
};
DesktopSessionAgentTest::DesktopSessionAgentTest()
- : task_runner_(new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure())),
+ : task_runner_(
+ new AutoThreadTaskRunner(task_environment_.GetMainThreadTaskRunner(),
+ run_loop_.QuitClosure())),
agent_(new DesktopSessionAgent(task_runner_,
task_runner_,
task_runner_,
diff --git a/remoting/host/file_transfer/buffered_file_writer_unittest.cc b/remoting/host/file_transfer/buffered_file_writer_unittest.cc
index 9647249b..d896a62 100644
--- a/remoting/host/file_transfer/buffered_file_writer_unittest.cc
+++ b/remoting/host/file_transfer/buffered_file_writer_unittest.cc
@@ -34,7 +34,7 @@
bool complete_called_ = false;
base::Optional<protocol::FileTransfer_Error> error_ = base::nullopt;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
BufferedFileWriterTest::BufferedFileWriterTest() = default;
@@ -69,16 +69,16 @@
base::Unretained(this)));
writer.Start(kTestFilename);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
writer.Write(kTestDataOne);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
writer.Write(kTestDataTwo);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
writer.Write(kTestDataThree);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
writer.Close();
ASSERT_EQ(false, complete_called_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(true, complete_called_);
ASSERT_EQ(1ul, test_io.files_written.size());
@@ -107,7 +107,7 @@
writer.Write(kTestDataThree);
writer.Close();
ASSERT_EQ(false, complete_called_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(true, complete_called_);
ASSERT_EQ(1ul, test_io.files_written.size());
@@ -135,11 +135,11 @@
writer.Start(kTestFilename);
writer.Write(kTestDataOne);
writer.Write(kTestDataTwo);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_io.io_error = fake_error;
writer.Write(kTestDataThree);
writer.Close();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(error_);
ASSERT_EQ(fake_error.SerializeAsString(), error_->SerializeAsString());
@@ -166,10 +166,10 @@
writer.Start(kTestFilename);
writer.Write(kTestDataOne);
writer.Write(kTestDataTwo);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
writer.Write(kTestDataThree);
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(!complete_called_ && !error_);
ASSERT_EQ(1ul, test_io.files_written.size());
diff --git a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
index 23f7ac7..bb5892c 100644
--- a/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
+++ b/remoting/host/file_transfer/file_transfer_message_handler_unittest.cc
@@ -83,7 +83,7 @@
const std::string kTestDataTwo = "this is the second test string";
const std::string kTestDataThree = "this is the third test string";
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<protocol::FakeMessagePipe> fake_pipe_;
protocol::FileTransfer fake_metadata_;
protocol::FileTransfer fake_end_;
@@ -92,9 +92,9 @@
};
FileTransferMessageHandlerTest::FileTransferMessageHandlerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
FileTransferMessageHandlerTest::~FileTransferMessageHandlerTest() = default;
void FileTransferMessageHandlerTest::SetUp() {
@@ -129,7 +129,7 @@
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
fake_pipe_->Receive(DataToBuffer(kTestDataThree));
fake_pipe_->Receive(MessageToBuffer(fake_end_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -163,11 +163,11 @@
fake_pipe_->Receive(MessageToBuffer(fake_metadata_));
fake_pipe_->Receive(DataToBuffer(kTestDataOne));
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_io.io_error = fake_error;
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
fake_pipe_->Receive(MessageToBuffer(fake_end_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -198,9 +198,9 @@
fake_pipe_->Receive(MessageToBuffer(fake_metadata_));
fake_pipe_->Receive(DataToBuffer(kTestDataOne));
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->Receive(MessageToBuffer(fake_error_message));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -230,7 +230,7 @@
fake_pipe_->Receive(MessageToBuffer(fake_metadata_));
fake_pipe_->Receive(DataToBuffer(kTestDataOne));
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -254,7 +254,7 @@
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
fake_pipe_->Receive(DataToBuffer(kTestDataThree));
fake_pipe_->Receive(MessageToBuffer(fake_end_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -284,7 +284,7 @@
fake_pipe_->Receive(DataToBuffer(kTestDataTwo));
fake_pipe_->Receive(DataToBuffer(kTestDataThree));
fake_pipe_->Receive(MessageToBuffer(fake_end_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->Receive(MessageToBuffer(fake_metadata_));
fake_pipe_->ClosePipe();
@@ -315,7 +315,7 @@
fake_pipe_->Receive(DataToBuffer(kTestDataThree));
fake_pipe_->Receive(MessageToBuffer(fake_end_));
fake_pipe_->Receive(DataToBuffer(kTestDataOne));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -351,9 +351,9 @@
fake_pipe_->OpenPipe();
fake_pipe_->Receive(MessageToBuffer(fake_request_transfer_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->Receive(MessageToBuffer(fake_success_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -383,7 +383,7 @@
fake_pipe_->OpenPipe();
fake_pipe_->Receive(MessageToBuffer(fake_request_transfer_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
@@ -413,7 +413,7 @@
fake_pipe_->OpenPipe();
fake_pipe_->Receive(MessageToBuffer(fake_request_transfer_));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
fake_pipe_->ClosePipe();
diff --git a/remoting/host/file_transfer/ipc_file_operations_unittest.cc b/remoting/host/file_transfer/ipc_file_operations_unittest.cc
index 44462d5..663afd7 100644
--- a/remoting/host/file_transfer/ipc_file_operations_unittest.cc
+++ b/remoting/host/file_transfer/ipc_file_operations_unittest.cc
@@ -114,7 +114,7 @@
base::FilePath TestDir();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedPathOverride scoped_path_override_;
std::unique_ptr<FileOperations> file_operations_;
@@ -122,13 +122,13 @@
};
IpcFileOperationsTest::IpcFileOperationsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
// Points DIR_USER_DESKTOP at a scoped temporary directory.
scoped_path_override_(base::DIR_USER_DESKTOP),
file_operations_(std::make_unique<IpcTestBridge>(
- scoped_task_environment_.GetMainThreadTaskRunner())) {}
+ task_environment_.GetMainThreadTaskRunner())) {}
IpcFileOperationsTest::~IpcFileOperationsTest() = default;
@@ -150,7 +150,7 @@
open_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, writer->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, writer->state());
ASSERT_TRUE(open_result);
ASSERT_TRUE(*open_result);
@@ -162,7 +162,7 @@
write_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, writer->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, writer->state());
ASSERT_TRUE(write_result);
ASSERT_TRUE(*write_result);
@@ -173,7 +173,7 @@
close_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, writer->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kComplete, writer->state());
std::string actual_file_data;
@@ -192,7 +192,7 @@
BindLambda([&](FileOperations::Writer::Result result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
for (const auto& chunk : {kTestDataOne, kTestDataTwo, kTestDataThree}) {
@@ -201,12 +201,12 @@
BindLambda([&](FileOperations::Writer::Result result) {
write_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(write_result && *write_result);
}
writer.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(base::IsDirectoryEmpty(TestDir()));
}
@@ -221,7 +221,7 @@
BindLambda([&](FileOperations::Writer::Result result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
base::Optional<FileOperations::Writer::Result> write_result;
@@ -232,7 +232,7 @@
EXPECT_EQ(FileOperations::kBusy, writer->state());
writer.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(write_result);
EXPECT_TRUE(base::IsDirectoryEmpty(TestDir()));
@@ -255,7 +255,7 @@
open_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, reader->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(open_result);
ASSERT_TRUE(*open_result);
@@ -268,7 +268,7 @@
read_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, reader->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(read_result);
ASSERT_TRUE(*read_result);
@@ -292,7 +292,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
base::Optional<FileOperations::Reader::ReadResult> read_result;
@@ -302,7 +302,7 @@
BindLambda([&](FileOperations::Reader::ReadResult result) {
read_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(read_result);
ASSERT_TRUE(*read_result);
@@ -313,7 +313,7 @@
BindLambda([&](FileOperations::Reader::ReadResult result) {
read_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kComplete, reader->state());
ASSERT_TRUE(read_result);
ASSERT_TRUE(*read_result);
@@ -334,7 +334,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
base::Optional<FileOperations::Reader::ReadResult> read_result;
@@ -342,7 +342,7 @@
BindLambda([&](FileOperations::Reader::ReadResult result) {
read_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kComplete, reader->state());
ASSERT_TRUE(read_result);
ASSERT_TRUE(*read_result);
@@ -360,7 +360,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kFailed, reader->state());
ASSERT_TRUE(open_result);
ASSERT_FALSE(*open_result);
diff --git a/remoting/host/file_transfer/local_file_operations_unittest.cc b/remoting/host/file_transfer/local_file_operations_unittest.cc
index 335b969..d334b0f0 100644
--- a/remoting/host/file_transfer/local_file_operations_unittest.cc
+++ b/remoting/host/file_transfer/local_file_operations_unittest.cc
@@ -60,7 +60,7 @@
FileOperations::Writer::Result result);
void OnCloseComplete(FileOperations::Writer::Result result);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedPathOverride scoped_path_override_;
std::unique_ptr<FileOperations> file_operations_;
std::unique_ptr<FileOperations::Writer> file_writer_;
@@ -68,13 +68,13 @@
};
LocalFileOperationsTest::LocalFileOperationsTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ : task_environment_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
// Points DIR_USER_DESKTOP at a scoped temporary directory.
scoped_path_override_(base::DIR_USER_DESKTOP),
file_operations_(std::make_unique<LocalFileOperations>(
- scoped_task_environment_.GetMainThreadTaskRunner())) {}
+ task_environment_.GetMainThreadTaskRunner())) {}
void LocalFileOperationsTest::SetUp() {}
@@ -130,7 +130,7 @@
kTestFilename,
base::queue<std::string>({kTestDataOne, kTestDataTwo, kTestDataThree}),
true /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(operation_completed_);
std::string actual_file_data;
@@ -144,17 +144,17 @@
TEST_F(LocalFileOperationsTest, RenamesFileIfExists) {
WriteFile(kTestFilename, base::queue<std::string>({kTestDataOne}),
true /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(operation_completed_);
WriteFile(kTestFilename, base::queue<std::string>({kTestDataTwo}),
true /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(operation_completed_);
WriteFile(kTestFilename, base::queue<std::string>({kTestDataThree}),
true /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(operation_completed_);
std::string actual_file_data_one;
@@ -177,11 +177,11 @@
kTestFilename,
base::queue<std::string>({kTestDataOne, kTestDataTwo, kTestDataThree}),
false /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(operation_completed_);
file_writer_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(base::IsDirectoryEmpty(TestDir()));
}
@@ -190,12 +190,12 @@
TEST_F(LocalFileOperationsTest, CancelsWhileOperationPending) {
WriteFile(kTestFilename, base::queue<std::string>({kTestDataOne}),
false /* close */);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(operation_completed_);
file_writer_->WriteChunk(kTestDataTwo, base::DoNothing());
file_writer_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(base::IsDirectoryEmpty(TestDir()));
}
@@ -217,7 +217,7 @@
open_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, reader->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(open_result);
ASSERT_TRUE(*open_result);
@@ -240,7 +240,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
for (const auto& chunk : {kTestDataOne, kTestDataTwo, kTestDataThree}) {
@@ -251,7 +251,7 @@
read_result = std::move(result);
}));
ASSERT_EQ(FileOperations::kBusy, reader->state());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(read_result);
ASSERT_TRUE(*read_result);
@@ -274,7 +274,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(open_result && *open_result);
base::Optional<FileOperations::Reader::ReadResult> read_result;
@@ -283,7 +283,7 @@
BindLambda([&](FileOperations::Reader::ReadResult result) {
read_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(FileOperations::kReady, reader->state());
ASSERT_TRUE(read_result && *read_result);
EXPECT_EQ(contents, **read_result);
@@ -293,7 +293,7 @@
BindLambda([&](FileOperations::Reader::ReadResult result) {
read_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kComplete, reader->state());
ASSERT_TRUE(read_result && *read_result);
EXPECT_EQ(std::size_t{0}, (*read_result)->size());
@@ -310,7 +310,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kFailed, reader->state());
ASSERT_TRUE(open_result);
ASSERT_FALSE(*open_result);
@@ -329,7 +329,7 @@
reader->Open(BindLambda([&](FileOperations::Reader::OpenResult result) {
open_result = std::move(result);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(FileOperations::kFailed, reader->state());
ASSERT_TRUE(open_result);
ASSERT_FALSE(*open_result);
diff --git a/remoting/host/ftl_host_change_notification_listener_unittest.cc b/remoting/host/ftl_host_change_notification_listener_unittest.cc
index 81b1ff64..323f5f8 100644
--- a/remoting/host/ftl_host_change_notification_listener_unittest.cc
+++ b/remoting/host/ftl_host_change_notification_listener_unittest.cc
@@ -76,7 +76,7 @@
ftl::Id system_sender_id_;
ftl::Id peer_sender_id_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockListener mock_listener_;
MockSignalStrategy signal_strategy_;
diff --git a/remoting/host/ftl_signaling_connector_unittest.cc b/remoting/host/ftl_signaling_connector_unittest.cc
index 132348a..4a67374 100644
--- a/remoting/host/ftl_signaling_connector_unittest.cc
+++ b/remoting/host/ftl_signaling_connector_unittest.cc
@@ -33,7 +33,7 @@
}
~FtlSignalingConnectorTest() override {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -45,8 +45,8 @@
return signaling_connector_->backoff_reset_timer_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
FakeSignalStrategy signal_strategy_{SignalingAddress(kLocalFtlId)};
base::MockCallback<base::OnceClosure> auth_failed_callback_;
std::unique_ptr<FtlSignalingConnector> signaling_connector_;
@@ -54,7 +54,7 @@
TEST_F(FtlSignalingConnectorTest, StartAndSucceed) {
signaling_connector_->Start();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.ProceedConnect();
ASSERT_EQ(SignalStrategy::CONNECTED, signal_strategy_.GetState());
@@ -63,7 +63,7 @@
TEST_F(FtlSignalingConnectorTest, StartAndAuthFailed) {
signaling_connector_->Start();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.SetIsSignInError(true);
@@ -76,14 +76,14 @@
TEST_F(FtlSignalingConnectorTest, StartAndFailedThenRetryAndSucceeded) {
ASSERT_EQ(0, GetBackoff().failure_count());
signaling_connector_->Start();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.SetError(SignalStrategy::NETWORK_ERROR);
signal_strategy_.Disconnect();
ASSERT_EQ(1, GetBackoff().failure_count());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.ProceedConnect();
@@ -91,7 +91,7 @@
ASSERT_EQ(1, GetBackoff().failure_count());
// Failure count is eventually reset to 0.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(0, GetBackoff().failure_count());
}
@@ -99,7 +99,7 @@
StartAndImmediatelyDisconnected_RetryWithBackoff) {
ASSERT_EQ(0, GetBackoff().failure_count());
signaling_connector_->Start();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.ProceedConnect();
@@ -108,7 +108,7 @@
signal_strategy_.Disconnect();
ASSERT_EQ(1, GetBackoff().failure_count());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
signal_strategy_.ProceedConnect();
@@ -116,7 +116,7 @@
ASSERT_EQ(1, GetBackoff().failure_count());
// Failure count is eventually reset to 0.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(0, GetBackoff().failure_count());
}
@@ -125,7 +125,7 @@
net::NetworkChangeNotifier::CONNECTION_ETHERNET);
// Reconnection starts with some delay.
ASSERT_EQ(SignalStrategy::DISCONNECTED, signal_strategy_.GetState());
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(SignalStrategy::CONNECTING, signal_strategy_.GetState());
}
diff --git a/remoting/host/gcd_rest_client_unittest.cc b/remoting/host/gcd_rest_client_unittest.cc
index 0fb7e88a..68f68379 100644
--- a/remoting/host/gcd_rest_client_unittest.cc
+++ b/remoting/host/gcd_rest_client_unittest.cc
@@ -62,7 +62,7 @@
GcdRestClient::Result last_result_ = GcdRestClient::OTHER_ERROR;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(GcdRestClientTest, NetworkErrorGettingToken) {
diff --git a/remoting/host/gcd_state_updater_unittest.cc b/remoting/host/gcd_state_updater_unittest.cc
index 6193e567..8e09f44 100644
--- a/remoting/host/gcd_state_updater_unittest.cc
+++ b/remoting/host/gcd_state_updater_unittest.cc
@@ -34,9 +34,9 @@
class GcdStateUpdaterTest : public testing::Test {
public:
GcdStateUpdaterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ : task_environment_(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
test_shared_url_loader_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)),
@@ -65,7 +65,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::SimpleTestClock test_clock_;
net::TestURLFetcherFactory url_fetcher_factory_;
network::TestURLLoaderFactory test_url_loader_factory_;
@@ -97,7 +97,7 @@
}));
signal_strategy_.Connect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1, on_success_count_);
@@ -115,12 +115,12 @@
// Connect, then re-connect with a different JID while the status
// update for the first connection is pending.
signal_strategy_.Connect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
signal_strategy_.Disconnect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
signal_strategy_.SetLocalAddress(SignalingAddress("local_jid2"));
signal_strategy_.Connect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Let the first status update finish. This should be a no-op in
// the updater because the local JID has changed since this request
@@ -140,11 +140,11 @@
network::GetUploadData(request));
test_url_loader_factory_.AddResponse(request.url.spec(), std::string(),
net::HTTP_OK);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}));
// Wait for the next retry.
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
// There should be a new pending request now with the new local JID.
// It will be caught and handled by the interceptor installed above.
@@ -162,14 +162,14 @@
&signal_strategy_, std::move(rest_client_)));
signal_strategy_.Connect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
auto* request = GetPendingRequest(0);
test_url_loader_factory_.SimulateResponseWithoutRemovingFromPendingList(
request, network::ResourceResponseHead(), std::string(),
network::URLLoaderCompletionStatus(net::ERR_FAILED));
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(1));
request = GetPendingRequest(1);
test_url_loader_factory_.SimulateResponseWithoutRemovingFromPendingList(
@@ -189,7 +189,7 @@
&signal_strategy_, std::move(rest_client_)));
signal_strategy_.Connect();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
auto* request = GetPendingRequest(0);
test_url_loader_factory_.SimulateResponseWithoutRemovingFromPendingList(
diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc
index 9ea014503..988aaa1 100644
--- a/remoting/host/heartbeat_sender_unittest.cc
+++ b/remoting/host/heartbeat_sender_unittest.cc
@@ -101,7 +101,7 @@
~HeartbeatSenderTest() override {
heartbeat_sender_.reset();
signal_strategy_.reset();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -122,8 +122,8 @@
return heartbeat_sender_->backoff_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
MockHeartbeatClient* mock_client_;
std::unique_ptr<FakeSignalStrategy> signal_strategy_;
@@ -156,7 +156,7 @@
EXPECT_CALL(mock_heartbeat_successful_callback_, Run()).Times(1);
signal_strategy_->Connect();
- scoped_task_environment_.FastForwardBy(kWaitForAllStrategiesConnectedTimeout);
+ task_environment_.FastForwardBy(kWaitForAllStrategiesConnectedTimeout);
}
TEST_F(HeartbeatSenderTest, SignalingReconnect_NewHeartbeats) {
@@ -221,7 +221,7 @@
response.set_set_interval_seconds(kGoodIntervalSeconds);
std::move(callback).Run(grpc::Status::OK, response);
});
- scoped_task_environment_.FastForwardBy(kTestHeartbeatDelay);
+ task_environment_.FastForwardBy(kTestHeartbeatDelay);
}
TEST_F(HeartbeatSenderTest, UnknownHostId) {
@@ -237,7 +237,7 @@
signal_strategy_->Connect();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
TEST_F(HeartbeatSenderTest, SendHeartbeatLogEntryOnHeartbeat) {
@@ -271,9 +271,9 @@
ASSERT_EQ(0, GetBackoff().failure_count());
signal_strategy_->Connect();
ASSERT_EQ(1, GetBackoff().failure_count());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_EQ(2, GetBackoff().failure_count());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_EQ(0, GetBackoff().failure_count());
}
@@ -292,7 +292,7 @@
EXPECT_CALL(mock_unauthenticated_error_callback_, Run()).Times(1);
signal_strategy_->Connect();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
// Should retry heartbeating at least once.
ASSERT_LT(1, heartbeat_count);
diff --git a/remoting/host/host_power_save_blocker_unittest.cc b/remoting/host/host_power_save_blocker_unittest.cc
index c95d4f1..334c8f7 100644
--- a/remoting/host/host_power_save_blocker_unittest.cc
+++ b/remoting/host/host_power_save_blocker_unittest.cc
@@ -24,8 +24,8 @@
void SetUp() override;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::Thread blocking_thread_;
scoped_refptr<HostStatusMonitor> monitor_;
std::unique_ptr<HostPowerSaveBlocker> blocker_;
@@ -39,7 +39,7 @@
base::Thread::Options(base::MessagePumpType::IO, 0)) &&
blocking_thread_.WaitUntilThreadStarted());
blocker_.reset(new HostPowerSaveBlocker(
- monitor_, scoped_task_environment_.GetMainThreadTaskRunner(),
+ monitor_, task_environment_.GetMainThreadTaskRunner(),
blocking_thread_.task_runner()));
}
diff --git a/remoting/host/host_status_logger_unittest.cc b/remoting/host/host_status_logger_unittest.cc
index f401015..86d2d12d 100644
--- a/remoting/host/host_status_logger_unittest.cc
+++ b/remoting/host/host_status_logger_unittest.cc
@@ -138,7 +138,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockSignalStrategy signal_strategy_;
std::unique_ptr<XmppLogToServer> log_to_server_;
std::unique_ptr<HostStatusLogger> host_status_logger_;
diff --git a/remoting/host/input_monitor/local_input_monitor_unittest.cc b/remoting/host/input_monitor/local_input_monitor_unittest.cc
index be5ce5e3..a04fb9c 100644
--- a/remoting/host/input_monitor/local_input_monitor_unittest.cc
+++ b/remoting/host/input_monitor/local_input_monitor_unittest.cc
@@ -33,12 +33,12 @@
void SetUp() override;
- base::test::ScopedTaskEnvironment scoped_task_environment_ {
+ base::test::TaskEnvironment task_environment_ {
#if defined(OS_WIN)
- base::test::ScopedTaskEnvironment::MainThreadType::UI
+ base::test::TaskEnvironment::MainThreadType::UI
#else // !defined(OS_WIN)
// Required to watch a file descriptor from NativeMessageProcessHost.
- base::test::ScopedTaskEnvironment::MainThreadType::IO
+ base::test::TaskEnvironment::MainThreadType::IO
#endif // !defined(OS_WIN)
};
diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc
index 0f1cda3..8751a181 100644
--- a/remoting/host/ipc_desktop_environment_unittest.cc
+++ b/remoting/host/ipc_desktop_environment_unittest.cc
@@ -198,8 +198,8 @@
void RunMainLoopUntilDone();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
// Runs until |desktop_session_proxy_| is connected to the desktop.
std::unique_ptr<base::RunLoop> setup_run_loop_;
@@ -263,9 +263,9 @@
void IpcDesktopEnvironmentTest::SetUp() {
// Arrange to run |message_loop_| until no components depend on it.
- task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- main_run_loop_.QuitClosure());
+ task_runner_ =
+ new AutoThreadTaskRunner(task_environment_.GetMainThreadTaskRunner(),
+ main_run_loop_.QuitClosure());
io_task_runner_ = AutoThread::CreateWithType("IPC thread", task_runner_,
base::MessagePumpType::IO);
@@ -371,7 +371,7 @@
.Times(AtMost(1));
// Let tests know that the remote desktop environment is created.
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, setup_run_loop_->QuitClosure());
return desktop_environment;
diff --git a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
index ba5c780..30c7e91 100644
--- a/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
+++ b/remoting/host/it2me/it2me_confirmation_dialog_proxy_unittest.cc
@@ -87,7 +87,7 @@
~It2MeConfirmationDialogProxyTest() override;
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner() {
- return scoped_task_environment_.GetMainThreadTaskRunner();
+ return task_environment_.GetMainThreadTaskRunner();
}
scoped_refptr<base::SingleThreadTaskRunner> dialog_task_runner() {
@@ -111,7 +111,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
base::Thread dialog_thread_;
diff --git a/remoting/host/it2me/it2me_host_unittest.cc b/remoting/host/it2me/it2me_host_unittest.cc
index 3dc361ee..d7d0999 100644
--- a/remoting/host/it2me/it2me_host_unittest.cc
+++ b/remoting/host/it2me/it2me_host_unittest.cc
@@ -188,7 +188,7 @@
private:
void StartupHostStateHelper(const base::Closure& quit_closure);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<FakeSignalStrategy> fake_bot_signal_strategy_;
diff --git a/remoting/host/linux/audio_pipe_reader_unittest.cc b/remoting/host/linux/audio_pipe_reader_unittest.cc
index 70d35a4..08a1952 100644
--- a/remoting/host/linux/audio_pipe_reader_unittest.cc
+++ b/remoting/host/linux/audio_pipe_reader_unittest.cc
@@ -75,7 +75,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<base::Thread> audio_thread_;
base::ScopedTempDir test_dir_;
diff --git a/remoting/host/linux/certificate_watcher_unittest.cc b/remoting/host/linux/certificate_watcher_unittest.cc
index 1cb3742..7b97c2c 100644
--- a/remoting/host/linux/certificate_watcher_unittest.cc
+++ b/remoting/host/linux/certificate_watcher_unittest.cc
@@ -28,7 +28,7 @@
class CertificateWatcherTest : public testing::Test {
public:
CertificateWatcherTest()
- : task_runner_(scoped_task_environment_.GetMainThreadTaskRunner()) {
+ : task_runner_(task_environment_.GetMainThreadTaskRunner()) {
EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
watcher_.reset(new CertificateWatcher(
base::Bind(&CertificateWatcherTest::OnRestart, base::Unretained(this)),
@@ -93,8 +93,8 @@
}
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
base::ScopedTempDir temp_dir_;
std::unique_ptr<CertificateWatcher> watcher_;
diff --git a/remoting/host/linux/x11_character_injector_unittest.cc b/remoting/host/linux/x11_character_injector_unittest.cc
index 898af6db..8ccd7287 100644
--- a/remoting/host/linux/x11_character_injector_unittest.cc
+++ b/remoting/host/linux/x11_character_injector_unittest.cc
@@ -152,7 +152,7 @@
std::unique_ptr<X11CharacterInjector> injector_;
FakeX11Keyboard* keyboard_; // Owned by |injector_|.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
void X11CharacterInjectorTest::SetUp() {
diff --git a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
index d4093207..084d54a 100644
--- a/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
+++ b/remoting/host/mouse_cursor_monitor_proxy_unittest.cc
@@ -92,7 +92,7 @@
const webrtc::DesktopVector& position) override;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
base::Thread capture_thread_;
std::unique_ptr<MouseCursorMonitorProxy> proxy_;
@@ -102,8 +102,7 @@
void MouseCursorMonitorProxyTest::OnMouseCursor(
webrtc::MouseCursor* mouse_cursor) {
- DCHECK(scoped_task_environment_.GetMainThreadTaskRunner()
- ->BelongsToCurrentThread());
+ DCHECK(task_environment_.GetMainThreadTaskRunner()->BelongsToCurrentThread());
EXPECT_EQ(kCursorWidth, mouse_cursor->image()->size().width());
EXPECT_EQ(kCursorHeight, mouse_cursor->image()->size().height());
diff --git a/remoting/host/mouse_shape_pump_unittest.cc b/remoting/host/mouse_shape_pump_unittest.cc
index 43ccaf5..f4b3ab2 100644
--- a/remoting/host/mouse_shape_pump_unittest.cc
+++ b/remoting/host/mouse_shape_pump_unittest.cc
@@ -66,7 +66,7 @@
void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape);
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
std::unique_ptr<MouseShapePump> pump_;
diff --git a/remoting/host/native_messaging/native_messaging_reader_unittest.cc b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
index 7fb509a..895ad3e 100644
--- a/remoting/host/native_messaging/native_messaging_reader_unittest.cc
+++ b/remoting/host/native_messaging/native_messaging_reader_unittest.cc
@@ -50,8 +50,8 @@
private:
// MessageLoop declared here, since the NativeMessageReader ctor requires a
// MessageLoop to have been created.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<base::RunLoop> run_loop_;
};
diff --git a/remoting/host/policy_watcher_unittest.cc b/remoting/host/policy_watcher_unittest.cc
index 594df442..8fdf939f 100644
--- a/remoting/host/policy_watcher_unittest.cc
+++ b/remoting/host/policy_watcher_unittest.cc
@@ -61,8 +61,7 @@
class PolicyWatcherTest : public testing::Test {
public:
PolicyWatcherTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
void SetUp() override {
// We expect no callbacks unless explicitly specified by individual tests.
@@ -250,7 +249,7 @@
static const char* kHostDomain;
static const char* kClientDomain;
static const char* kPortRange;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockPolicyCallback mock_policy_callback_;
// |policy_loader_| is owned by |policy_watcher_|. PolicyWatcherTest retains
diff --git a/remoting/host/process_stats_sender_unittest.cc b/remoting/host/process_stats_sender_unittest.cc
index e2ca4763..7ed2029e 100644
--- a/remoting/host/process_stats_sender_unittest.cc
+++ b/remoting/host/process_stats_sender_unittest.cc
@@ -98,7 +98,7 @@
} // namespace
TEST(ProcessStatsSenderTest, ReportUsage) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
FakeProcessStatsStub stub;
std::unique_ptr<ProcessStatsSender> stats;
@@ -115,7 +115,7 @@
},
base::Unretained(&stats), std::cref(stub), std::cref(agent),
base::Unretained(&run_loop)));
- scoped_task_environment.GetMainThreadTaskRunner()->PostTask(
+ task_environment.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(
[](std::unique_ptr<ProcessStatsSender>* stats,
@@ -134,7 +134,7 @@
}
TEST(ProcessStatsSenderTest, MergeUsage) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
FakeProcessStatsStub stub;
std::unique_ptr<ProcessStatsSender> stats;
@@ -154,7 +154,7 @@
},
base::Unretained(&stats), std::cref(stub), std::cref(agent1),
std::cref(agent2), base::Unretained(&run_loop)));
- scoped_task_environment.GetMainThreadTaskRunner()->PostTask(
+ task_environment.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(
[](std::unique_ptr<ProcessStatsSender>* stats,
diff --git a/remoting/host/remoting_register_support_host_request_unittest.cc b/remoting/host/remoting_register_support_host_request_unittest.cc
index 9e842b7..6af7d510 100644
--- a/remoting/host/remoting_register_support_host_request_unittest.cc
+++ b/remoting/host/remoting_register_support_host_request_unittest.cc
@@ -83,7 +83,7 @@
~RemotingRegisterSupportHostTest() override {
register_host_request_.reset();
signal_strategy_.reset();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -96,8 +96,8 @@
MOCK_METHOD0(CancelPendingRequests, void());
};
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
std::unique_ptr<RemotingRegisterSupportHostRequest> register_host_request_;
MockRegisterSupportHostClient* register_host_client_ = nullptr;
diff --git a/remoting/host/resizing_host_observer_unittest.cc b/remoting/host/resizing_host_observer_unittest.cc
index 38d7272..2ff51cf4 100644
--- a/remoting/host/resizing_host_observer_unittest.cc
+++ b/remoting/host/resizing_host_observer_unittest.cc
@@ -297,7 +297,7 @@
resizing_host_observer_->SetNowFunctionForTesting(
base::Bind(&ResizingHostObserverTest::GetTime, base::Unretained(this)));
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
EXPECT_EQ(MakeResolution(100, 100),
@@ -315,7 +315,7 @@
// Since it was queued 900 + 99 ms after the first, we need to wait an
// additional 1ms. However, since RunLoop is not guaranteed to process tasks
// with the same due time in FIFO order, wait an additional 1ms for safety.
- scoped_task_environment.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromMilliseconds(2));
run_loop.Run();
diff --git a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
index ccb29f8..8ce1f728 100644
--- a/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
+++ b/remoting/host/security_key/security_key_auth_handler_posix_unittest.cc
@@ -168,8 +168,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<base::RunLoop> run_loop_;
base::Thread file_thread_;
diff --git a/remoting/host/security_key/security_key_auth_handler_win_unittest.cc b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
index 917f005..bf7fb015 100644
--- a/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
+++ b/remoting/host/security_key/security_key_auth_handler_win_unittest.cc
@@ -85,8 +85,8 @@
mojo::NamedPlatformChannel::ServerName GetUniqueTestChannelHandle();
// IPC tests require a valid MessageLoop to run.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
// Used to allow |message_loop_| to run during tests. The instance is reset
// after each stage of the tests has been completed.
diff --git a/remoting/host/security_key/security_key_extension_session_unittest.cc b/remoting/host/security_key/security_key_extension_session_unittest.cc
index a1b23c1..98d5b6b 100644
--- a/remoting/host/security_key/security_key_extension_session_unittest.cc
+++ b/remoting/host/security_key/security_key_extension_session_unittest.cc
@@ -153,8 +153,8 @@
void CreateSecurityKeyConnection();
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
// Object under test.
std::unique_ptr<SecurityKeyExtensionSession> security_key_extension_session_;
diff --git a/remoting/host/security_key/security_key_ipc_client_unittest.cc b/remoting/host/security_key/security_key_ipc_client_unittest.cc
index 830e7a6..3a84f9f4 100644
--- a/remoting/host/security_key/security_key_ipc_client_unittest.cc
+++ b/remoting/host/security_key/security_key_ipc_client_unittest.cc
@@ -79,8 +79,8 @@
mojo::NamedPlatformChannel::ServerName GenerateUniqueTestChannelName();
// IPC tests require a valid MessageLoop to run.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
// Used to allow |message_loop_| to run during tests. The instance is reset
// after each stage of the tests has been completed.
diff --git a/remoting/host/security_key/security_key_ipc_server_unittest.cc b/remoting/host/security_key/security_key_ipc_server_unittest.cc
index 3984384..1f60bd6 100644
--- a/remoting/host/security_key/security_key_ipc_server_unittest.cc
+++ b/remoting/host/security_key/security_key_ipc_server_unittest.cc
@@ -69,8 +69,8 @@
uint32_t desktop_session_id() const override { return peer_session_id_; }
// IPC tests require a valid MessageLoop to run.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
// Used to allow |message_loop_| to run during tests. The instance is reset
// after each stage of the tests has been completed.
diff --git a/remoting/host/security_key/security_key_message_handler_unittest.cc b/remoting/host/security_key/security_key_message_handler_unittest.cc
index 467ac0ef..31c510f 100644
--- a/remoting/host/security_key/security_key_message_handler_unittest.cc
+++ b/remoting/host/security_key/security_key_message_handler_unittest.cc
@@ -53,8 +53,8 @@
std::unique_ptr<SecurityKeyMessageHandler> message_handler_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<base::RunLoop> run_loop_;
DISALLOW_COPY_AND_ASSIGN(SecurityKeyMessageHandlerTest);
diff --git a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
index 6425f86..51fb8efa 100644
--- a/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
+++ b/remoting/host/security_key/security_key_message_reader_impl_unittest.cc
@@ -61,8 +61,8 @@
std::vector<std::unique_ptr<SecurityKeyMessage>> messages_received_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<base::RunLoop> run_loop_;
DISALLOW_COPY_AND_ASSIGN(SecurityKeyMessageReaderImplTest);
diff --git a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
index 690d1e632..2e7bb1c6 100644
--- a/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
+++ b/remoting/host/security_key/security_key_message_writer_impl_unittest.cc
@@ -103,8 +103,8 @@
reader_thread.StartWithOptions(options);
// Used to block until the read complete callback is triggered.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
ASSERT_TRUE(base::PostTaskAndReplyWithResult(
diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc
index 37d6563c..41f03b2 100644
--- a/remoting/host/token_validator_factory_impl_unittest.cc
+++ b/remoting/host/token_validator_factory_impl_unittest.cc
@@ -111,8 +111,7 @@
class TokenValidatorFactoryImplTest : public testing::Test {
public:
TokenValidatorFactoryImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
void SuccessCallback(const std::string& shared_secret) {
EXPECT_FALSE(shared_secret.empty());
@@ -134,7 +133,7 @@
void SetUp() override {
key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair);
request_context_getter_ = new net::TestURLRequestContextGetter(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
std::make_unique<SetResponseURLRequestContext>());
ThirdPartyAuthConfig config;
config.token_url = GURL(kTokenUrl);
@@ -177,7 +176,7 @@
context->SetErrorResponse(failure_phase, net_error);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
scoped_refptr<RsaKeyPair> key_pair_;
scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
diff --git a/remoting/host/win/rdp_client_unittest.cc b/remoting/host/win/rdp_client_unittest.cc
index 33170f4..5e55c6b7 100644
--- a/remoting/host/win/rdp_client_unittest.cc
+++ b/remoting/host/win/rdp_client_unittest.cc
@@ -100,8 +100,8 @@
// Used by RdpClient. The loop is stopped once there are no more references to
// |task_runner_|.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
base::RunLoop run_loop_;
scoped_refptr<AutoThreadTaskRunner> task_runner_;
@@ -122,8 +122,7 @@
void RdpClientTest::SetUp() {
// Arrange to run |run_loop_| until no components depend on it.
task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner(), run_loop_.QuitClosure());
module_.reset(new RdpClientModule());
}
@@ -141,7 +140,7 @@
EXPECT_TRUE(WtsTerminalMonitor::LookupTerminalId(session_id, &id));
EXPECT_EQ(id, terminal_id_);
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&RdpClientTest::CloseRdpClient, base::Unretained(this)));
}
diff --git a/remoting/host/win/worker_process_launcher_unittest.cc b/remoting/host/win/worker_process_launcher_unittest.cc
index 7d0b5f3..964f49e 100644
--- a/remoting/host/win/worker_process_launcher_unittest.cc
+++ b/remoting/host/win/worker_process_launcher_unittest.cc
@@ -158,8 +158,8 @@
protected:
void DoLaunchProcess();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
scoped_refptr<AutoThreadTaskRunner> task_runner_;
// Receives messages sent to the worker process.
@@ -196,7 +196,7 @@
void WorkerProcessLauncherTest::SetUp() {
task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
base::Bind(&WorkerProcessLauncherTest::QuitMainMessageLoop,
base::Unretained(this)));
@@ -341,7 +341,7 @@
}
void WorkerProcessLauncherTest::QuitMainMessageLoop() {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated());
}
diff --git a/remoting/host/xmpp_register_support_host_request_unittest.cc b/remoting/host/xmpp_register_support_host_request_unittest.cc
index 7a5c143..eeeda3e9 100644
--- a/remoting/host/xmpp_register_support_host_request_unittest.cc
+++ b/remoting/host/xmpp_register_support_host_request_unittest.cc
@@ -73,8 +73,8 @@
.WillRepeatedly(RemoveListener(&signal_strategy_listeners_));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
MockSignalStrategy signal_strategy_;
base::ObserverList<SignalStrategy::Listener, true> signal_strategy_listeners_;
scoped_refptr<RsaKeyPair> key_pair_;
@@ -94,7 +94,7 @@
EXPECT_CALL(callback_, Run("", base::TimeDelta::FromSeconds(0),
ErrorCode::SIGNALING_TIMEOUT));
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(15));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(15));
}
TEST_F(XmppRegisterSupportHostRequestTest, Send) {
@@ -110,7 +110,7 @@
.WillOnce(DoAll(SaveArg<0>(&sent_iq), Return(true)));
request->OnSignalStrategyStateChange(SignalStrategy::CONNECTED);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Verify format of the query.
std::unique_ptr<XmlElement> stanza(sent_iq);
@@ -185,7 +185,7 @@
}
EXPECT_EQ(1, consumed);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
} // namespace remoting
diff --git a/remoting/ios/facade/host_list_service_unittest.mm b/remoting/ios/facade/host_list_service_unittest.mm
index b547855..eff07a6 100644
--- a/remoting/ios/facade/host_list_service_unittest.mm
+++ b/remoting/ios/facade/host_list_service_unittest.mm
@@ -80,7 +80,7 @@
id remoting_service_mock_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<HostListService::CallbackSubscription>
host_list_state_subscription_;
std::unique_ptr<HostListService::CallbackSubscription>
diff --git a/remoting/protocol/audio_decode_scheduler_unittest.cc b/remoting/protocol/audio_decode_scheduler_unittest.cc
index 4148b67..54e7810 100644
--- a/remoting/protocol/audio_decode_scheduler_unittest.cc
+++ b/remoting/protocol/audio_decode_scheduler_unittest.cc
@@ -57,7 +57,7 @@
void TearDown() override;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
scoped_refptr<AutoThreadTaskRunner> audio_decode_task_runner_;
scoped_refptr<AutoThreadTaskRunner> main_task_runner_;
@@ -66,8 +66,7 @@
void AudioDecodeSchedulerTest::SetUp() {
main_task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner(), run_loop_.QuitClosure());
audio_decode_task_runner_ = AutoThread::Create("decode", main_task_runner_);
session_config_ = SessionConfig::ForTestWithAudio();
}
diff --git a/remoting/protocol/audio_pump_unittest.cc b/remoting/protocol/audio_pump_unittest.cc
index 51beb4d7..1b0a0dd 100644
--- a/remoting/protocol/audio_pump_unittest.cc
+++ b/remoting/protocol/audio_pump_unittest.cc
@@ -71,7 +71,7 @@
base::OnceClosure done) override;
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// |source_| and |encoder_| are owned by the |pump_|.
FakeAudioSource* source_;
@@ -89,7 +89,7 @@
void AudioPumpTest::SetUp() {
source_ = new FakeAudioSource();
encoder_ = new FakeAudioEncoder();
- pump_.reset(new AudioPump(scoped_task_environment_.GetMainThreadTaskRunner(),
+ pump_.reset(new AudioPump(task_environment_.GetMainThreadTaskRunner(),
base::WrapUnique(source_),
base::WrapUnique(encoder_), this));
}
diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h
index d899eba..5805a163 100644
--- a/remoting/protocol/authenticator_test_base.h
+++ b/remoting/protocol/authenticator_test_base.h
@@ -65,7 +65,7 @@
std::unique_ptr<P2PStreamSocket> host_socket_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(AuthenticatorTestBase);
};
diff --git a/remoting/protocol/capture_scheduler_unittest.cc b/remoting/protocol/capture_scheduler_unittest.cc
index d1d668b..87d3bb0 100644
--- a/remoting/protocol/capture_scheduler_unittest.cc
+++ b/remoting/protocol/capture_scheduler_unittest.cc
@@ -73,7 +73,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<CaptureScheduler> scheduler_;
diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc
index c815812..ee21951 100644
--- a/remoting/protocol/channel_multiplexer_unittest.cc
+++ b/remoting/protocol/channel_multiplexer_unittest.cc
@@ -125,7 +125,7 @@
private:
// Must be instantiated before the FakeStreamChannelFactories below.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
protected:
FakeStreamChannelFactory host_channel_factory_;
diff --git a/remoting/protocol/channel_socket_adapter_unittest.cc b/remoting/protocol/channel_socket_adapter_unittest.cc
index 83eba3a..e486b79 100644
--- a/remoting/protocol/channel_socket_adapter_unittest.cc
+++ b/remoting/protocol/channel_socket_adapter_unittest.cc
@@ -55,8 +55,8 @@
std::unique_ptr<TransportChannelSocketAdapter> target_;
net::CompletionRepeatingCallback callback_;
int callback_result_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
};
// Verify that Read() returns net::ERR_IO_PENDING.
diff --git a/remoting/protocol/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc
index 9e735b2..805876b 100644
--- a/remoting/protocol/chromium_socket_factory_unittest.cc
+++ b/remoting/protocol/chromium_socket_factory_unittest.cc
@@ -82,7 +82,7 @@
while (last_packet_.empty() && attempts++ < kMaxAttempts) {
sender->SendTo(test_packet.data(), test_packet.size(),
socket_->GetLocalAddress(), options);
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop_.QuitClosure(), kAttemptPeriod);
run_loop_.Run();
}
@@ -91,8 +91,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
base::RunLoop run_loop_;
std::unique_ptr<rtc::PacketSocketFactory> socket_factory_;
diff --git a/remoting/protocol/client_video_dispatcher_unittest.cc b/remoting/protocol/client_video_dispatcher_unittest.cc
index 08cda1d4..a316dda 100644
--- a/remoting/protocol/client_video_dispatcher_unittest.cc
+++ b/remoting/protocol/client_video_dispatcher_unittest.cc
@@ -46,7 +46,7 @@
void OnMessageReceived(std::unique_ptr<CompoundBuffer> buffer);
void OnReadError(int error);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Set to true in OnChannelInitialized().
bool initialized_ = false;
diff --git a/remoting/protocol/connection_unittest.cc b/remoting/protocol/connection_unittest.cc
index 24a8c5d..786ecbd81 100644
--- a/remoting/protocol/connection_unittest.cc
+++ b/remoting/protocol/connection_unittest.cc
@@ -262,8 +262,7 @@
public testing::WithParamInterface<bool> {
public:
ConnectionTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
video_encode_thread_("VideoEncode"),
audio_encode_thread_("AudioEncode"),
audio_decode_thread_("AudioDecode") {
@@ -291,16 +290,16 @@
host_connection_.reset(new WebrtcConnectionToClient(
base::WrapUnique(host_session_),
TransportContext::ForTests(protocol::TransportRole::SERVER),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner()));
client_connection_.reset(new WebrtcConnectionToHost());
} else {
host_connection_.reset(new IceConnectionToClient(
base::WrapUnique(host_session_),
TransportContext::ForTests(protocol::TransportRole::SERVER),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- scoped_task_environment_.GetMainThreadTaskRunner()));
+ task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner()));
client_connection_.reset(new IceConnectionToHost());
}
@@ -436,7 +435,7 @@
.empty());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
MockConnectionToClientEventHandler host_event_handler_;
diff --git a/remoting/protocol/data_channel_manager_unittest.cc b/remoting/protocol/data_channel_manager_unittest.cc
index 3070b0e3..fe5c74d5 100644
--- a/remoting/protocol/data_channel_manager_unittest.cc
+++ b/remoting/protocol/data_channel_manager_unittest.cc
@@ -99,7 +99,7 @@
FakeNamedMessagePipeHandler::handlers_;
void TestDataChannelManagerFullMatch(bool asynchronous) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
DataChannelManager manager;
manager.RegisterCreateHandlerCallback("FullMatch", base::Bind(
[](const std::string& expected_data,
@@ -191,7 +191,7 @@
}
void TestDataChannelManagerMultipleRegistrations(bool asynchronous) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
DataChannelManager manager;
manager.RegisterCreateHandlerCallback("FullMatch", base::Bind(
[](const std::string& expected_data,
diff --git a/remoting/protocol/ice_transport_unittest.cc b/remoting/protocol/ice_transport_unittest.cc
index 04c3d1d..f5445a1 100644
--- a/remoting/protocol/ice_transport_unittest.cc
+++ b/remoting/protocol/ice_transport_unittest.cc
@@ -180,8 +180,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<base::RunLoop> run_loop_;
NetworkSettings network_settings_;
diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc
index 0423b0e..d13535a6 100644
--- a/remoting/protocol/jingle_session_unittest.cc
+++ b/remoting/protocol/jingle_session_unittest.cc
@@ -321,8 +321,8 @@
}
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
NetworkSettings network_settings_;
diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc
index 1138fce..b946e8a 100644
--- a/remoting/protocol/message_reader_unittest.cc
+++ b/remoting/protocol/message_reader_unittest.cc
@@ -79,7 +79,7 @@
callback_.OnMessage();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MessageReader> reader_;
FakeStreamSocket socket_;
MockMessageReceivedCallback callback_;
diff --git a/remoting/protocol/monitored_video_stub_unittest.cc b/remoting/protocol/monitored_video_stub_unittest.cc
index 054e48b..6516f5c 100644
--- a/remoting/protocol/monitored_video_stub_unittest.cc
+++ b/remoting/protocol/monitored_video_stub_unittest.cc
@@ -43,7 +43,7 @@
MOCK_METHOD1(OnVideoChannelStatus, void(bool connected));
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockVideoStub video_stub_;
std::unique_ptr<MonitoredVideoStub> monitor_;
@@ -91,7 +91,7 @@
monitor_->ProcessVideoPacket(std::move(packet_), base::Closure());
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, base::RunLoop::QuitCurrentWhenIdleClosureDeprecated(),
// The delay should be much greater than |kTestOverrideDelayMilliseconds|.
TestTimeouts::tiny_timeout());
diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc
index 13a5546..33a9802 100644
--- a/remoting/protocol/pairing_registry_unittest.cc
+++ b/remoting/protocol/pairing_registry_unittest.cc
@@ -82,7 +82,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
int callback_count_;
diff --git a/remoting/protocol/pseudotcp_adapter_unittest.cc b/remoting/protocol/pseudotcp_adapter_unittest.cc
index 08887264..5f6ea9a8 100644
--- a/remoting/protocol/pseudotcp_adapter_unittest.cc
+++ b/remoting/protocol/pseudotcp_adapter_unittest.cc
@@ -316,7 +316,7 @@
std::unique_ptr<PseudoTcpAdapter> host_pseudotcp_;
std::unique_ptr<PseudoTcpAdapter> client_pseudotcp_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PseudoTcpAdapterTest, DataTransfer) {
diff --git a/remoting/protocol/remoting_ice_config_request_unittest.cc b/remoting/protocol/remoting_ice_config_request_unittest.cc
index b947b920..255b26e3 100644
--- a/remoting/protocol/remoting_ice_config_request_unittest.cc
+++ b/remoting/protocol/remoting_ice_config_request_unittest.cc
@@ -55,7 +55,7 @@
return received_config;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
RemotingIceConfigRequest request_;
test::GrpcTestServer<MockNetworkTraversalService> test_server_;
};
diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
index e05c1f6..07244c1 100644
--- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
+++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc
@@ -136,7 +136,7 @@
client_socket_ = std::move(socket);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<RsaKeyPair> key_pair_;
std::string host_cert_;
diff --git a/remoting/protocol/validating_authenticator_unittest.cc b/remoting/protocol/validating_authenticator_unittest.cc
index 26c72be..9ed4b37 100644
--- a/remoting/protocol/validating_authenticator_unittest.cc
+++ b/remoting/protocol/validating_authenticator_unittest.cc
@@ -77,7 +77,7 @@
std::unique_ptr<ValidatingAuthenticator> validating_authenticator_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ValidatingAuthenticatorTest);
};
diff --git a/remoting/protocol/video_frame_pump_unittest.cc b/remoting/protocol/video_frame_pump_unittest.cc
index e324dec..6a3998b 100644
--- a/remoting/protocol/video_frame_pump_unittest.cc
+++ b/remoting/protocol/video_frame_pump_unittest.cc
@@ -147,7 +147,7 @@
std::unique_ptr<VideoEncoder> encoder);
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
scoped_refptr<AutoThreadTaskRunner> encode_task_runner_;
scoped_refptr<AutoThreadTaskRunner> main_task_runner_;
@@ -158,8 +158,7 @@
void VideoFramePumpTest::SetUp() {
main_task_runner_ = new AutoThreadTaskRunner(
- scoped_task_environment_.GetMainThreadTaskRunner(),
- run_loop_.QuitClosure());
+ task_environment_.GetMainThreadTaskRunner(), run_loop_.QuitClosure());
encode_task_runner_ = AutoThread::Create("encode", main_task_runner_);
}
diff --git a/remoting/protocol/webrtc_audio_source_adapter_unittest.cc b/remoting/protocol/webrtc_audio_source_adapter_unittest.cc
index 05b8ec8..241481e3 100644
--- a/remoting/protocol/webrtc_audio_source_adapter_unittest.cc
+++ b/remoting/protocol/webrtc_audio_source_adapter_unittest.cc
@@ -61,7 +61,7 @@
public:
void SetUp() override {
audio_source_adapter_ = new rtc::RefCountedObject<WebrtcAudioSourceAdapter>(
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
audio_source_ = new FakeAudioSource();
audio_source_adapter_->Start(base::WrapUnique(audio_source_));
audio_source_adapter_->AddSink(&sink_);
@@ -74,7 +74,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeAudioSource* audio_source_;
scoped_refptr<WebrtcAudioSourceAdapter> audio_source_adapter_;
FakeAudioSink sink_;
diff --git a/remoting/protocol/webrtc_transport_unittest.cc b/remoting/protocol/webrtc_transport_unittest.cc
index fcc6180..4fa5b99 100644
--- a/remoting/protocol/webrtc_transport_unittest.cc
+++ b/remoting/protocol/webrtc_transport_unittest.cc
@@ -150,8 +150,7 @@
class WebrtcTransportTest : public testing::Test {
public:
WebrtcTransportTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
jingle_glue::JingleThreadWrapper::EnsureForCurrentMessageLoop();
network_settings_ =
NetworkSettings(NetworkSettings::NAT_TRAVERSAL_OUTGOING);
@@ -297,7 +296,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
NetworkSettings network_settings_;
diff --git a/remoting/signaling/ftl_message_reception_channel_unittest.cc b/remoting/signaling/ftl_message_reception_channel_unittest.cc
index 52e689f..702bcd9 100644
--- a/remoting/signaling/ftl_message_reception_channel_unittest.cc
+++ b/remoting/signaling/ftl_message_reception_channel_unittest.cc
@@ -106,8 +106,8 @@
base::TimeDelta GetTimeUntilRetry() const;
int GetRetryFailureCount() const;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
std::unique_ptr<FtlMessageReceptionChannel> channel_;
base::MockCallback<FtlMessageReceptionChannel::StreamOpener>
mock_stream_opener_;
@@ -122,7 +122,7 @@
void FtlMessageReceptionChannelTest::TearDown() {
channel_.reset();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
base::TimeDelta FtlMessageReceptionChannelTest::GetTimeUntilRetry() const {
@@ -214,7 +214,7 @@
GetTimeUntilRetry().InSecondsF(), 0.5);
// This will make the channel reopen the stream.
- scoped_task_environment_.FastForwardBy(GetTimeUntilRetry());
+ task_environment_.FastForwardBy(GetTimeUntilRetry());
},
&old_stream))
.WillOnce(StartStream(
@@ -322,7 +322,7 @@
const ReceiveMessagesResponseCallback& on_incoming_msg,
StatusCallback on_channel_closed) {
std::move(on_channel_ready).Run();
- scoped_task_environment_.FastForwardBy(
+ task_environment_.FastForwardBy(
FtlMessageReceptionChannel::kPongTimeout);
ASSERT_EQ(1, GetRetryFailureCount());
@@ -330,7 +330,7 @@
GetTimeUntilRetry().InSecondsF(), 0.5);
// This will make the channel reopen the stream.
- scoped_task_environment_.FastForwardBy(GetTimeUntilRetry());
+ task_environment_.FastForwardBy(GetTimeUntilRetry());
},
&old_stream))
.WillOnce(StartStream(
@@ -425,7 +425,7 @@
}
// This will tail-recursively call the stream opener.
- scoped_task_environment_.FastForwardBy(time_until_retry);
+ task_environment_.FastForwardBy(time_until_retry);
}));
channel_->StartReceivingMessages(base::DoNothing(),
diff --git a/remoting/signaling/ftl_messaging_client_unittest.cc b/remoting/signaling/ftl_messaging_client_unittest.cc
index 036271ff..0129a543 100644
--- a/remoting/signaling/ftl_messaging_client_unittest.cc
+++ b/remoting/signaling/ftl_messaging_client_unittest.cc
@@ -165,7 +165,7 @@
MockMessageReceptionChannel* mock_message_reception_channel_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockRegistrationManager mock_registration_manager_;
};
diff --git a/remoting/signaling/ftl_registration_manager_unittest.cc b/remoting/signaling/ftl_registration_manager_unittest.cc
index d7dee37..3029e8e5 100644
--- a/remoting/signaling/ftl_registration_manager_unittest.cc
+++ b/remoting/signaling/ftl_registration_manager_unittest.cc
@@ -82,8 +82,8 @@
return registration_manager_.sign_in_backoff_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
FakeOAuthTokenGetter token_getter{OAuthTokenGetter::SUCCESS, "fake_email",
"access_token"};
FtlRegistrationManager registration_manager_{
@@ -104,14 +104,14 @@
EXPECT_CALL(done_callback_, Run(IsStatusOk())).Times(1);
registration_manager_.SignInGaia(done_callback_.Get());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_TRUE(registration_manager_.IsSignedIn());
ASSERT_EQ("registration_id_1", registration_manager_.GetRegistrationId());
ASSERT_EQ(kAuthToken, registration_manager_.GetFtlAuthToken());
- scoped_task_environment_.FastForwardBy(kAuthTokenExpiration);
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(kAuthTokenExpiration);
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_EQ("registration_id_2", registration_manager_.GetRegistrationId());
}
@@ -140,7 +140,7 @@
EXPECT_CALL(done_callback_, Run(HasErrorCode(grpc::StatusCode::UNAVAILABLE)))
.Times(1);
registration_manager_.SignInGaia(done_callback_.Get());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_FALSE(registration_manager_.IsSignedIn());
ASSERT_EQ(1, GetBackoff().failure_count());
@@ -148,13 +148,13 @@
Run(HasErrorCode(grpc::StatusCode::UNAUTHENTICATED)))
.Times(1);
registration_manager_.SignInGaia(done_callback_.Get());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_FALSE(registration_manager_.IsSignedIn());
ASSERT_EQ(2, GetBackoff().failure_count());
EXPECT_CALL(done_callback_, Run(IsStatusOk())).Times(1);
registration_manager_.SignInGaia(done_callback_.Get());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_TRUE(registration_manager_.IsSignedIn());
ASSERT_EQ("registration_id", registration_manager_.GetRegistrationId());
ASSERT_EQ(0, GetBackoff().failure_count());
@@ -170,7 +170,7 @@
EXPECT_CALL(done_callback_, Run(IsStatusOk())).Times(1);
registration_manager_.SignInGaia(done_callback_.Get());
- scoped_task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoff().GetTimeUntilRelease());
ASSERT_TRUE(registration_manager_.IsSignedIn());
ASSERT_EQ("registration_id", registration_manager_.GetRegistrationId());
@@ -183,7 +183,7 @@
ASSERT_TRUE(registration_manager_.GetRegistrationId().empty());
ASSERT_TRUE(registration_manager_.GetFtlAuthToken().empty());
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_FALSE(registration_manager_.IsSignedIn());
}
diff --git a/remoting/signaling/ftl_signal_strategy_unittest.cc b/remoting/signaling/ftl_signal_strategy_unittest.cc
index d1c8725..c1bd69d 100644
--- a/remoting/signaling/ftl_signal_strategy_unittest.cc
+++ b/remoting/signaling/ftl_signal_strategy_unittest.cc
@@ -211,7 +211,7 @@
~FtlSignalStrategyTest() override {
signal_strategy_->RemoveListener(this);
signal_strategy_.reset();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -236,8 +236,8 @@
const std::string&,
const ftl::ChromotingMessage&));
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
MockOAuthTokenGetter* token_getter_ = nullptr;
FakeRegistrationManager* registration_manager_ = nullptr;
diff --git a/remoting/signaling/iq_sender_unittest.cc b/remoting/signaling/iq_sender_unittest.cc
index d0518d5..94be6a0 100644
--- a/remoting/signaling/iq_sender_unittest.cc
+++ b/remoting/signaling/iq_sender_unittest.cc
@@ -96,7 +96,7 @@
return result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockSignalStrategy signal_strategy_;
std::unique_ptr<IqSender> sender_;
base::MockCallback<IqSender::ReplyCallback> callback_;
diff --git a/remoting/signaling/message_tracker_unittest.cc b/remoting/signaling/message_tracker_unittest.cc
index c6d7bb1d..ecd7f4f 100644
--- a/remoting/signaling/message_tracker_unittest.cc
+++ b/remoting/signaling/message_tracker_unittest.cc
@@ -14,8 +14,8 @@
protected:
static constexpr base::TimeDelta GetCleanupInterval();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
MessageTracker message_tracker_;
};
@@ -36,14 +36,14 @@
TEST_F(MessageTrackerTest, TrackIdAndAdvanceTimer_ExpiredIdNotRejected) {
message_tracker_.TrackId("1");
ASSERT_TRUE(message_tracker_.IsIdTracked("1"));
- scoped_task_environment_.FastForwardBy(GetCleanupInterval() * 2);
+ task_environment_.FastForwardBy(GetCleanupInterval() * 2);
ASSERT_FALSE(message_tracker_.IsIdTracked("1"));
}
TEST_F(MessageTrackerTest, TrackIdAndAdvanceTimer_NotExpiredIdRejected) {
message_tracker_.TrackId("1");
ASSERT_TRUE(message_tracker_.IsIdTracked("1"));
- scoped_task_environment_.FastForwardBy(GetCleanupInterval() / 2);
+ task_environment_.FastForwardBy(GetCleanupInterval() / 2);
ASSERT_TRUE(message_tracker_.IsIdTracked("1"));
}
diff --git a/remoting/signaling/remoting_log_to_server_unittest.cc b/remoting/signaling/remoting_log_to_server_unittest.cc
index bafb5e7..6dbbb0b 100644
--- a/remoting/signaling/remoting_log_to_server_unittest.cc
+++ b/remoting/signaling/remoting_log_to_server_unittest.cc
@@ -27,7 +27,7 @@
}
~RemotingLogToServerTest() override {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -42,8 +42,8 @@
using CreateLogEntryResponseCallback =
RemotingLogToServer::CreateLogEntryResponseCallback;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
base::MockCallback<RemotingLogToServer::CreateLogEntryCallback>
mock_create_log_entry_;
@@ -69,7 +69,7 @@
entry.Set("test-key", "test-value");
log_to_server_.Log(entry);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(0, GetBackoffEntry().failure_count());
}
@@ -91,8 +91,7 @@
log_to_server_.Log(entry);
for (int i = 1; i <= GetMaxSendLogAttempts(); i++) {
- scoped_task_environment_.FastForwardBy(
- GetBackoffEntry().GetTimeUntilRelease());
+ task_environment_.FastForwardBy(GetBackoffEntry().GetTimeUntilRelease());
ASSERT_EQ(i, GetBackoffEntry().failure_count());
}
}
@@ -133,26 +132,26 @@
ServerLogEntry entry_1;
entry_1.Set("test-key-1", "test-value-1");
log_to_server_.Log(entry_1);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ServerLogEntry entry_2;
entry_2.Set("test-key-2", "test-value-2");
log_to_server_.Log(entry_2);
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(0, GetBackoffEntry().failure_count());
std::move(response_callback_1)
.Run(grpc::Status(grpc::StatusCode::UNAVAILABLE, "unavailable"), {});
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
std::move(response_callback_2)
.Run(grpc::Status(grpc::StatusCode::UNAVAILABLE, "unavailable"), {});
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(2, GetBackoffEntry().failure_count());
std::move(response_callback_1).Run(grpc::Status::OK, {});
std::move(response_callback_2).Run(grpc::Status::OK, {});
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
ASSERT_EQ(0, GetBackoffEntry().failure_count());
}
diff --git a/remoting/signaling/xmpp_log_to_server_unittest.cc b/remoting/signaling/xmpp_log_to_server_unittest.cc
index f27aac0..02f2e44 100644
--- a/remoting/signaling/xmpp_log_to_server_unittest.cc
+++ b/remoting/signaling/xmpp_log_to_server_unittest.cc
@@ -48,7 +48,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
MockSignalStrategy signal_strategy_;
std::unique_ptr<XmppLogToServer> xmpp_log_to_server_;
diff --git a/remoting/test/access_token_fetcher_unittest.cc b/remoting/test/access_token_fetcher_unittest.cc
index cb3cddc..58823de 100644
--- a/remoting/test/access_token_fetcher_unittest.cc
+++ b/remoting/test/access_token_fetcher_unittest.cc
@@ -81,7 +81,7 @@
std::string refresh_token_retrieved_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
scoped_refptr<network::SharedURLLoaderFactory> shared_factory_;
@@ -89,8 +89,7 @@
};
AccessTokenFetcherTest::AccessTokenFetcherTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
shared_factory_(
base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
&test_url_loader_factory_)) {}
diff --git a/remoting/test/connection_time_observer_unittest.cc b/remoting/test/connection_time_observer_unittest.cc
index 8899b5f..863ce7a9 100644
--- a/remoting/test/connection_time_observer_unittest.cc
+++ b/remoting/test/connection_time_observer_unittest.cc
@@ -115,8 +115,8 @@
connection_time_observer_->SetTransitionTimesMapForTest(
std::map<protocol::ConnectionToHost::State, base::TimeTicks>());
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::RunLoop run_loop;
// Should fail to find INITIALIZING in an empty map.
diff --git a/remoting/test/host_list_fetcher_unittest.cc b/remoting/test/host_list_fetcher_unittest.cc
index 0d1fd94..8287448 100644
--- a/remoting/test/host_list_fetcher_unittest.cc
+++ b/remoting/test/host_list_fetcher_unittest.cc
@@ -194,8 +194,8 @@
net::URLRequestStatus::Status status);
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
net::FakeURLFetcherFactory url_fetcher_factory_;
DISALLOW_COPY_AND_ASSIGN(HostListFetcherTest);
diff --git a/remoting/test/it2me_standalone_host.cc b/remoting/test/it2me_standalone_host.cc
index 63c722b..1ef3cd4 100644
--- a/remoting/test/it2me_standalone_host.cc
+++ b/remoting/test/it2me_standalone_host.cc
@@ -38,8 +38,7 @@
using ::remoting::protocol::MockSession;
It2MeStandaloneHost::It2MeStandaloneHost()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
context_(ChromotingHostContext::Create(
new AutoThreadTaskRunner(base::ThreadTaskRunnerHandle::Get(),
run_loop_.QuitClosure()))),
diff --git a/remoting/test/it2me_standalone_host.h b/remoting/test/it2me_standalone_host.h
index 5d1f643..c142c586 100644
--- a/remoting/test/it2me_standalone_host.h
+++ b/remoting/test/it2me_standalone_host.h
@@ -43,7 +43,7 @@
private:
void Connect();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
std::unique_ptr<ChromotingHostContext> context_;
scoped_refptr<AutoThreadTaskRunner> main_task_runner_;
diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
index cf49959..c7b4c77a 100644
--- a/remoting/test/protocol_perftest.cc
+++ b/remoting/test/protocol_perftest.cc
@@ -53,7 +53,7 @@
namespace remoting {
-using base::test::ScopedTaskEnvironment;
+using base::test::TaskEnvironment;
using protocol::ChannelConfig;
namespace {
@@ -109,7 +109,7 @@
public HostStatusObserver {
public:
ProtocolPerfTest()
- : task_environment_(ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(TaskEnvironment::MainThreadType::IO),
host_thread_("host"),
capture_thread_("capture"),
encode_thread_("encode"),
@@ -381,7 +381,7 @@
void MeasureTotalLatency(bool use_webrtc);
void MeasureScrollPerformance(bool use_webrtc);
- ScopedTaskEnvironment task_environment_;
+ TaskEnvironment task_environment_;
scoped_refptr<FakeNetworkDispatcher> fake_network_dispatcher_;
diff --git a/remoting/test/test_chromoting_client_unittest.cc b/remoting/test/test_chromoting_client_unittest.cc
index 415881ea..2ef88f2a 100644
--- a/remoting/test/test_chromoting_client_unittest.cc
+++ b/remoting/test/test_chromoting_client_unittest.cc
@@ -53,8 +53,8 @@
protocol::ErrorCode error_code) override;
void ConnectionReady(bool ready) override;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
DISALLOW_COPY_AND_ASSIGN(TestChromotingClientTest);
};
diff --git a/rlz/lib/rlz_lib_test.cc b/rlz/lib/rlz_lib_test.cc
index 06a489e..a7cbba0 100644
--- a/rlz/lib/rlz_lib_test.cc
+++ b/rlz/lib/rlz_lib_test.cc
@@ -108,7 +108,7 @@
url_loader_factory->AddResponse(url, kGoodPingResponses);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(RlzLibTest, RecordProductEvent) {
diff --git a/rlz/test/rlz_unittest_main.cc b/rlz/test/rlz_unittest_main.cc
index bd555db..ec6c6dd 100644
--- a/rlz/test/rlz_unittest_main.cc
+++ b/rlz/test/rlz_unittest_main.cc
@@ -28,7 +28,7 @@
mojo::core::Init();
- // RlzLibTest uses base::test::ScopedTaskEnvironment that needs TestTimeouts.
+ // RlzLibTest uses base::test::TaskEnvironment that needs TestTimeouts.
TestTimeouts::Initialize();
int ret = RUN_ALL_TESTS();
diff --git a/sandbox/mac/mojom/mojom_traits_unittest.cc b/sandbox/mac/mojom/mojom_traits_unittest.cc
index fc30101..8d44042e 100644
--- a/sandbox/mac/mojom/mojom_traits_unittest.cc
+++ b/sandbox/mac/mojom/mojom_traits_unittest.cc
@@ -29,7 +29,7 @@
std::move(callback).Run(std::move(token));
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
sandbox::mac::mojom::TraitsTestServicePtr interface_ptr_;
mojo::Binding<sandbox::mac::mojom::TraitsTestService> binding_;
diff --git a/services/audio/debug_recording_unittest.cc b/services/audio/debug_recording_unittest.cc
index 311e59b..b12890a 100644
--- a/services/audio/debug_recording_unittest.cc
+++ b/services/audio/debug_recording_unittest.cc
@@ -21,7 +21,7 @@
#include "services/service_manager/public/cpp/service_keepalive.h"
#include "testing/gmock/include/gmock/gmock.h"
-using testing::_;
+ using testing::_;
using testing::Exactly;
namespace audio {
@@ -100,7 +100,7 @@
void DestroyDebugRecording() {
remote_debug_recording_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(service_keepalive_.HasNoRefs());
}
@@ -145,7 +145,7 @@
EXPECT_CALL(*mock_debug_recording_manager_, EnableDebugRecording(_));
remote_debug_recording_->Enable(std::move(remote_file_provider));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int id = 1;
EXPECT_CALL(
@@ -153,7 +153,7 @@
DoCreateWavFile(media::AudioDebugRecordingStreamType::kInput, id));
debug_recording_->CreateWavFile(media::AudioDebugRecordingStreamType::kInput,
id, base::BindOnce(&FileCreated));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_CALL(*mock_debug_recording_manager_, DisableDebugRecording());
DestroyDebugRecording();
diff --git a/services/audio/device_notifier_unittest.cc b/services/audio/device_notifier_unittest.cc
index 51cfb38..7986af76 100644
--- a/services/audio/device_notifier_unittest.cc
+++ b/services/audio/device_notifier_unittest.cc
@@ -59,14 +59,14 @@
void DestroyDeviceNotifier() {
remote_device_notifier_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(service_keepalive_.HasNoRefs());
}
// service_manager::ServiceKeepalive::Observer:
void OnIdleTimeout() override { OnNoServiceRefs(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Remote<mojom::DeviceNotifier> remote_device_notifier_;
private:
@@ -90,20 +90,20 @@
EXPECT_CALL(listener, DevicesChanged()).Times(0);
base::SystemMonitor::Get()->ProcessDevicesChanged(
base::SystemMonitor::DEVTYPE_AUDIO);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Register the listener and simulate an audio-device event.
remote_device_notifier_->RegisterListener(std::move(remote_device_listener));
EXPECT_CALL(listener, DevicesChanged());
base::SystemMonitor::Get()->ProcessDevicesChanged(
base::SystemMonitor::DEVTYPE_AUDIO);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Simulate a video-device event, which should be ignored.
EXPECT_CALL(listener, DevicesChanged()).Times(0);
base::SystemMonitor::Get()->ProcessDevicesChanged(
base::SystemMonitor::DEVTYPE_VIDEO_CAPTURE);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DestroyDeviceNotifier();
}
diff --git a/services/audio/input_controller_unittest.cc b/services/audio/input_controller_unittest.cc
index dd1fa6c..9ee986b 100644
--- a/services/audio/input_controller_unittest.cc
+++ b/services/audio/input_controller_unittest.cc
@@ -105,8 +105,8 @@
};
// Parameter: use audio processing.
-template <base::test::ScopedTaskEnvironment::TimeSource TimeSource =
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME>
+template <base::test::TaskEnvironment::TimeSource TimeSource =
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME>
class TimeSourceInputControllerTest : public ::testing::TestWithParam<bool> {
public:
TimeSourceInputControllerTest()
@@ -151,7 +151,7 @@
&stream_monitor_coordinator_, std::move(config_ptr));
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
StreamMonitorCoordinator stream_monitor_coordinator_;
std::unique_ptr<InputController> controller_;
@@ -170,7 +170,7 @@
};
using SystemTimeInputControllerTest = TimeSourceInputControllerTest<
- base::test::ScopedTaskEnvironment::TimeSource::SYSTEM_TIME>;
+ base::test::TaskEnvironment::TimeSource::SYSTEM_TIME>;
using InputControllerTest = TimeSourceInputControllerTest<>;
TEST_P(InputControllerTest, CreateAndCloseWithoutRecording) {
diff --git a/services/audio/input_stream_unittest.cc b/services/audio/input_stream_unittest.cc
index ec94109..5e85ac71 100644
--- a/services/audio/input_stream_unittest.cc
+++ b/services/audio/input_stream_unittest.cc
@@ -198,7 +198,7 @@
MOCK_METHOD1(BadMessageCallback, void(const std::string&));
private:
- base::test::ScopedTaskEnvironment scoped_task_env_;
+ base::test::TaskEnvironment scoped_task_env_;
media::MockAudioManager audio_manager_;
StreamFactory stream_factory_;
mojo::Remote<mojom::StreamFactory> remote_stream_factory_;
diff --git a/services/audio/input_sync_writer_unittest.cc b/services/audio/input_sync_writer_unittest.cc
index e7d34c6..1ff8ab4 100644
--- a/services/audio/input_sync_writer_unittest.cc
+++ b/services/audio/input_sync_writer_unittest.cc
@@ -155,7 +155,7 @@
using MockLogger =
base::MockCallback<base::RepeatingCallback<void(const std::string&)>>;
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
MockLogger mock_logger_;
std::unique_ptr<InputSyncWriter> writer_;
MockCancelableSyncSocket* socket_;
diff --git a/services/audio/local_muter_unittest.cc b/services/audio/local_muter_unittest.cc
index 4853fb2..661168e 100644
--- a/services/audio/local_muter_unittest.cc
+++ b/services/audio/local_muter_unittest.cc
@@ -84,7 +84,7 @@
}
TEST(LocalMuter, UnmutesWhenLastBindingIsLost) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
LoopbackCoordinator coordinator;
const UnguessableToken group_id = UnguessableToken::Create();
diff --git a/services/audio/log_factory_manager_unittest.cc b/services/audio/log_factory_manager_unittest.cc
index 6a910a0..cc3f294 100644
--- a/services/audio/log_factory_manager_unittest.cc
+++ b/services/audio/log_factory_manager_unittest.cc
@@ -98,14 +98,14 @@
void DestroyLogFactoryManager() {
remote_log_factory_manager_.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(service_keepalive_.HasNoRefs());
}
// service_manager::ServiceKeepalive::Observer:
void OnIdleTimeout() override { OnNoServiceRefs(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Remote<mojom::LogFactoryManager> remote_log_factory_manager_;
std::unique_ptr<LogFactoryManager> log_factory_manager_;
@@ -146,7 +146,7 @@
EXPECT_CALL(*mock_log1, OnStopped());
EXPECT_CALL(*mock_log1, OnClosed());
remote_log_factory_manager_->SetLogFactory(std::move(remote_log_factory));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Create another log after the factory is already set.
const int kComponentId2 = 2;
diff --git a/services/audio/loopback_stream_unittest.cc b/services/audio/loopback_stream_unittest.cc
index 860eab37..ec8ab1d 100644
--- a/services/audio/loopback_stream_unittest.cc
+++ b/services/audio/loopback_stream_unittest.cc
@@ -139,14 +139,14 @@
}
sources_.clear();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
MockClientAndObserver* client() { return &client_; }
LoopbackStream* stream() { return stream_.get(); }
FakeSyncWriter* consumer() { return consumer_; }
- void RunMojoTasks() { scoped_task_environment_.RunUntilIdle(); }
+ void RunMojoTasks() { task_environment_.RunUntilIdle(); }
FakeLoopbackGroupMember* AddSource(int channels, int sample_rate) {
sources_.emplace_back(std::make_unique<FakeLoopbackGroupMember>(
@@ -183,7 +183,7 @@
base::BindOnce([](LoopbackStreamTest* self,
LoopbackStream* stream) { self->stream_ = nullptr; },
this),
- scoped_task_environment_.GetMainThreadTaskRunner(),
+ task_environment_.GetMainThreadTaskRunner(),
remote_input_stream_.BindNewPipeAndPassReceiver(), std::move(client),
std::move(observer), GetLoopbackStreamParams(),
// The following argument is the |shared_memory_count|, which does not
@@ -193,7 +193,7 @@
// Override the clock used by the LoopbackStream so that everything is
// single-threaded and synchronized with the driving code in these tests.
- stream_->set_clock_for_testing(scoped_task_environment_.GetMockTickClock());
+ stream_->set_clock_for_testing(task_environment_.GetMockTickClock());
// Redirect the output of the LoopbackStream to a FakeSyncWriter.
// LoopbackStream takes ownership of the FakeSyncWriter.
@@ -234,14 +234,14 @@
// Render audio meant for local output at some point in the near
// future.
const base::TimeTicks output_timestamp =
- scoped_task_environment_.NowTicks() + kDelayUntilOutput;
+ task_environment_.NowTicks() + kDelayUntilOutput;
for (const auto& source : sources_) {
source->RenderMoreAudio(output_timestamp);
}
// Move the task runner forward, which will cause the FlowNetwork's
// delayed tasks to run, which will generate output for the consumer.
- scoped_task_environment_.FastForwardBy(kBufferDuration);
+ task_environment_.FastForwardBy(kBufferDuration);
} while (consumer_->GetRecordedFrameCount() < min_frames_to_record);
}
@@ -251,8 +251,8 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
LoopbackCoordinator coordinator_;
const base::UnguessableToken group_id_;
std::vector<std::unique_ptr<FakeLoopbackGroupMember>> sources_;
diff --git a/services/audio/output_stream_unittest.cc b/services/audio/output_stream_unittest.cc
index 902d480..0748de9 100644
--- a/services/audio/output_stream_unittest.cc
+++ b/services/audio/output_stream_unittest.cc
@@ -183,7 +183,7 @@
}
private:
- base::test::ScopedTaskEnvironment tasks_;
+ base::test::TaskEnvironment tasks_;
media::MockAudioManager audio_manager_;
StreamFactory stream_factory_;
mojo::Remote<mojom::StreamFactory> remote_stream_factory_;
diff --git a/services/audio/public/cpp/input_ipc_unittest.cc b/services/audio/public/cpp/input_ipc_unittest.cc
index 2642798..c22dde0a 100644
--- a/services/audio/public/cpp/input_ipc_unittest.cc
+++ b/services/audio/public/cpp/input_ipc_unittest.cc
@@ -113,7 +113,7 @@
class InputIPCTest : public ::testing::Test {
public:
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<audio::InputIPC> ipc;
const media::AudioParameters audioParameters =
media::AudioParameters(media::AudioParameters::AUDIO_PCM_LINEAR,
@@ -123,10 +123,9 @@
protected:
InputIPCTest()
- : scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ : task_environment(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
std::unique_ptr<StrictMock<TestStreamFactory>> factory_;
void SetUp() override {
@@ -142,14 +141,14 @@
StrictMock<MockDelegate> delegate;
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, StreamCreatedAfterCloseIsIgnored) {
StrictMock<MockDelegate> delegate;
ipc->CreateStream(&delegate, audioParameters, false, 0);
ipc->CloseStream();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, CreateStreamPropagatesInitiallyMuted) {
@@ -158,16 +157,16 @@
factory_->initially_muted_ = true;
EXPECT_CALL(delegate, GotOnStreamCreated(true));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
ipc->CloseStream();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
factory_->initially_muted_ = false;
EXPECT_CALL(delegate, GotOnStreamCreated(false));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
ipc->CloseStream();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, MutedStateChangesPropagates) {
@@ -175,26 +174,26 @@
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_CALL(delegate, OnMuted(true));
factory_->client_->OnMutedStateChanged(true);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_CALL(delegate, OnMuted(false));
factory_->client_->OnMutedStateChanged(false);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, Record_Records) {
StrictMock<MockDelegate> delegate;
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_CALL(factory_->stream_, Record());
ipc->RecordStream();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, IsReusable) {
@@ -202,10 +201,10 @@
StrictMock<MockDelegate> delegate;
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
ipc->CloseStream();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
testing::Mock::VerifyAndClearExpectations(&delegate);
}
@@ -215,11 +214,11 @@
StrictMock<MockDelegate> delegate;
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_CALL(factory_->stream_, SetVolume(kNewVolume));
ipc->SetVolume(kNewVolume);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, SetOutputDeviceForAec_AssociatesInputAndOutputForAec) {
@@ -227,11 +226,11 @@
StrictMock<MockDelegate> delegate;
EXPECT_CALL(delegate, GotOnStreamCreated(_));
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_CALL(*factory_, AssociateInputAndOutputForAec(_, kOutputDeviceId));
ipc->SetOutputDeviceForAec(kOutputDeviceId);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, FailedStreamCreationNullCallback) {
@@ -239,7 +238,7 @@
EXPECT_CALL(delegate, OnError()).Times(2);
factory_->should_fail_ = true;
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
TEST_F(InputIPCTest, FailedStreamCreationDestuctedFactory) {
@@ -247,7 +246,7 @@
EXPECT_CALL(delegate, OnError());
factory_ = nullptr;
ipc->CreateStream(&delegate, audioParameters, false, 0);
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
} // namespace audio
diff --git a/services/audio/public/cpp/output_device_unittest.cc b/services/audio/public/cpp/output_device_unittest.cc
index a975435..2c7b95ad 100644
--- a/services/audio/public/cpp/output_device_unittest.cc
+++ b/services/audio/public/cpp/output_device_unittest.cc
@@ -140,9 +140,9 @@
class AudioServiceOutputDeviceTest : public testing::Test {
public:
AudioServiceOutputDeviceTest()
- : task_env_(base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {
+ : task_env_(
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {
stream_factory_ = std::make_unique<FakeOutputStreamFactory>();
}
@@ -157,7 +157,7 @@
return stream_factory_->receiver_.BindNewPipeAndPassRemote();
}
- base::test::ScopedTaskEnvironment task_env_;
+ base::test::TaskEnvironment task_env_;
std::unique_ptr<FakeOutputStreamFactory> stream_factory_;
private:
diff --git a/services/audio/stream_factory_unittest.cc b/services/audio/stream_factory_unittest.cc
index 257e624..8b99aa4 100644
--- a/services/audio/stream_factory_unittest.cc
+++ b/services/audio/stream_factory_unittest.cc
@@ -20,7 +20,7 @@
// Stream creation is tested as part of the stream unit tests.
TEST(AudioServiceStreamFactoryTest, TakesServiceRef) {
- base::test::ScopedTaskEnvironment env;
+ base::test::TaskEnvironment env;
service_manager::ServiceKeepalive keepalive{nullptr, base::nullopt};
media::MockAudioManager audio_manager(
std::make_unique<media::TestAudioThread>());
diff --git a/services/audio/sync_reader_unittest.cc b/services/audio/sync_reader_unittest.cc
index b4410fc..370e20f 100644
--- a/services/audio/sync_reader_unittest.cc
+++ b/services/audio/sync_reader_unittest.cc
@@ -54,7 +54,7 @@
~SyncReaderBitstreamTest() override {}
private:
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
};
TEST_P(SyncReaderBitstreamTest, BitstreamBufferOverflow_DoesNotWriteOOB) {
diff --git a/services/audio/test/audio_system_to_service_adapter_test.cc b/services/audio/test/audio_system_to_service_adapter_test.cc
index 6990ef0..88256db 100644
--- a/services/audio/test/audio_system_to_service_adapter_test.cc
+++ b/services/audio/test/audio_system_to_service_adapter_test.cc
@@ -69,7 +69,7 @@
// AudioSystem conformance tests won't set expecnations.
NiceMock<MockFunction<void(void)>> system_info_bind_requested_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<media::MockAudioManager> audio_manager_;
std::unique_ptr<mojom::SystemInfo> system_info_impl_;
std::unique_ptr<mojo::Receiver<mojom::SystemInfo>> system_info_receiver_;
@@ -433,8 +433,8 @@
MOCK_METHOD0(ClientConnected, void(void));
MOCK_METHOD0(ClientDisconnected, void(void));
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
const base::Optional<std::string> valid_reply_{kValidReplyId};
base::MockCallback<media::AudioSystem::OnDeviceIdCallback> response_received_;
@@ -453,10 +453,10 @@
EXPECT_CALL(response_received_, Run(valid_reply_));
audio_system.GetAssociatedOutputDeviceID(kSomeDeviceId,
response_received_.Get());
- scoped_task_environment_.FastForwardBy(kResponseDelay);
+ task_environment_.FastForwardBy(kResponseDelay);
}
EXPECT_CALL(*this, ClientDisconnected());
- scoped_task_environment_.FastForwardBy(kDisconnectTimeout);
+ task_environment_.FastForwardBy(kDisconnectTimeout);
}
TEST_F(AudioSystemToServiceAdapterDisconnectTest,
@@ -469,10 +469,10 @@
EXPECT_CALL(response_received_, Run(valid_reply_));
audio_system.GetAssociatedOutputDeviceID(kSomeDeviceId,
response_received_.Get());
- scoped_task_environment_.FastForwardBy(kResponseDelay);
+ task_environment_.FastForwardBy(kResponseDelay);
}
EXPECT_CALL(*this, ClientDisconnected());
- scoped_task_environment_.FastForwardBy(kDisconnectTimeout);
+ task_environment_.FastForwardBy(kDisconnectTimeout);
}
TEST_F(AudioSystemToServiceAdapterDisconnectTest,
@@ -485,7 +485,7 @@
EXPECT_CALL(response_received_, Run(valid_reply_));
audio_system.GetAssociatedOutputDeviceID(kSomeDeviceId,
response_received_.Get());
- scoped_task_environment_.FastForwardBy(kResponseDelay);
+ task_environment_.FastForwardBy(kResponseDelay);
}
{
EXPECT_CALL(*this, ClientConnected()).Times(0);
@@ -493,10 +493,10 @@
EXPECT_CALL(response_received_, Run(valid_reply_));
audio_system.GetAssociatedOutputDeviceID(kSomeDeviceId,
response_received_.Get());
- scoped_task_environment_.FastForwardBy(kResponseDelay);
+ task_environment_.FastForwardBy(kResponseDelay);
}
EXPECT_CALL(*this, ClientDisconnected());
- scoped_task_environment_.FastForwardBy(kDisconnectTimeout);
+ task_environment_.FastForwardBy(kDisconnectTimeout);
}
TEST_F(AudioSystemToServiceAdapterDisconnectTest,
@@ -507,7 +507,7 @@
EXPECT_CALL(response_received_, Run(valid_reply_));
audio_system.GetAssociatedOutputDeviceID(kSomeDeviceId,
response_received_.Get());
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
} // namespace audio
diff --git a/services/audio/test/debug_recording_session_unittest.cc b/services/audio/test/debug_recording_session_unittest.cc
index 3f2207b..b39cf1f 100644
--- a/services/audio/test/debug_recording_session_unittest.cc
+++ b/services/audio/test/debug_recording_session_unittest.cc
@@ -71,7 +71,7 @@
protected:
mojo::Remote<mojom::DebugRecordingFileProvider> remote_file_provider_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
std::unique_ptr<DebugRecordingSession::DebugRecordingFileProvider>
@@ -95,7 +95,7 @@
static_cast<media::AudioManager*>(mock_audio_manager_.get()),
connector_factory_.RegisterInstance(audio::mojom::kServiceName));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void TearDown() override { ShutdownAudioManager(); }
@@ -106,14 +106,14 @@
std::make_unique<DebugRecordingSession>(
base::FilePath(kBaseFileName),
connector_factory_.CreateConnector()));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return session;
}
void DestroyDebugRecordingSession(
std::unique_ptr<DebugRecordingSession> debug_recording_session) {
debug_recording_session.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
private:
@@ -130,7 +130,7 @@
media::AudioDebugRecordingStreamType::kInput, id,
base::BindOnce(&DebugRecordingFileProviderTest::FileCreated,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::FilePath file_name(GetFileName(kInput, id));
EXPECT_TRUE(base::PathExists(file_name));
@@ -144,7 +144,7 @@
media::AudioDebugRecordingStreamType::kOutput, id,
base::BindOnce(&DebugRecordingFileProviderTest::FileCreated,
base::Unretained(this)));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::FilePath file_name(GetFileName(kOutput, id));
EXPECT_TRUE(base::PathExists(file_name));
@@ -161,7 +161,7 @@
base::BindOnce(&DebugRecordingFileProviderTest::FileCreated,
base::Unretained(this)));
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
for (uint32_t id : ids) {
base::FilePath file_name(GetFileName(kOutput, id));
@@ -181,7 +181,7 @@
id,
base::BindOnce(&DebugRecordingFileProviderTest::FileCreated,
base::Unretained(this))));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::FilePath file_name(
GetFileName(NumberToStringType(invalid_stream_type), id));
diff --git a/services/audio/test/fake_consumer.cc b/services/audio/test/fake_consumer.cc
index e7ada55..45eedc39 100644
--- a/services/audio/test/fake_consumer.cc
+++ b/services/audio/test/fake_consumer.cc
@@ -122,9 +122,9 @@
void FakeConsumer::SaveToFile(const base::FilePath& path) const {
// Not all tests set-up a full task environment. However, AudioDebugFileWriter
// requires one. Provide a temporary one here, if necessary.
- std::unique_ptr<base::test::ScopedTaskEnvironment> task_environment;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment;
if (!base::ThreadPoolInstance::Get()) {
- task_environment = std::make_unique<base::test::ScopedTaskEnvironment>();
+ task_environment = std::make_unique<base::test::TaskEnvironment>();
}
const media::AudioParameters params(
diff --git a/services/audio/test/in_process_service_test.cc b/services/audio/test/in_process_service_test.cc
index e498690..1fff855 100644
--- a/services/audio/test/in_process_service_test.cc
+++ b/services/audio/test/in_process_service_test.cc
@@ -171,7 +171,7 @@
media::AudioSystem* audio_system() { return audio_system_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestServiceManager test_service_manager_;
media::MockAudioManager audio_manager_;
std::unique_ptr<ServiceTestHelper> helper_;
diff --git a/services/audio/test/service_lifetime_connector_test.cc b/services/audio/test/service_lifetime_connector_test.cc
index ffc868db..4dcfade 100644
--- a/services/audio/test/service_lifetime_connector_test.cc
+++ b/services/audio/test/service_lifetime_connector_test.cc
@@ -53,8 +53,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
StrictMock<base::MockCallback<base::RepeatingClosure>> quit_request_;
std::unique_ptr<media::MockAudioManager> audio_manager_;
@@ -84,7 +84,7 @@
connector_factory.RegisterInstance(mojom::kServiceName));
service_->set_termination_closure(quit_request_.Get());
connector_ = connector_factory.CreateConnector();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
mojom::SystemInfoPtr info;
connector_->BindInterface(mojom::kServiceName, &info);
@@ -101,13 +101,13 @@
// Make sure the service does not disconnect before a timeout.
EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
info.reset();
- scoped_task_environment_.FastForwardBy(default_timeout / 2);
+ task_environment_.FastForwardBy(default_timeout / 2);
}
// Now wait for what is left from of the timeout: the service should
// disconnect.
EXPECT_CALL(quit_request_, Run()).Times(Exactly(1));
- scoped_task_environment_.FastForwardBy(default_timeout / 2);
+ task_environment_.FastForwardBy(default_timeout / 2);
service_.reset();
}
@@ -125,7 +125,7 @@
connector_factory.RegisterInstance(mojom::kServiceName));
service_->set_termination_closure(quit_request_.Get());
connector_ = connector_factory.CreateConnector();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
mojom::SystemInfoPtr info;
connector_->BindInterface(mojom::kServiceName, &info);
@@ -139,7 +139,7 @@
info.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
service_.reset();
}
@@ -154,7 +154,7 @@
connector_factory.RegisterInstance(mojom::kServiceName));
service_->set_termination_closure(quit_request_.Get());
connector_ = connector_factory.CreateConnector();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
mojom::SystemInfoPtr info;
connector_->BindInterface(mojom::kServiceName, &info);
@@ -168,7 +168,7 @@
info.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
service_.reset();
}
@@ -180,7 +180,7 @@
connector_->BindInterface(mojom::kServiceName, &info);
EXPECT_TRUE(info.is_bound());
- scoped_task_environment_.FastForwardBy(kQuitTimeout * 2);
+ task_environment_.FastForwardBy(kQuitTimeout * 2);
EXPECT_TRUE(info.is_bound());
}
@@ -193,12 +193,12 @@
// Make sure the service does not disconnect before a timeout.
EXPECT_CALL(quit_request_, Run()).Times(Exactly(0));
info.reset();
- scoped_task_environment_.FastForwardBy(kQuitTimeout / 2);
+ task_environment_.FastForwardBy(kQuitTimeout / 2);
}
// Now wait for what is left from of the timeout: the service should
// disconnect.
EXPECT_CALL(quit_request_, Run()).Times(Exactly(1));
- scoped_task_environment_.FastForwardBy(kQuitTimeout / 2);
+ task_environment_.FastForwardBy(kQuitTimeout / 2);
}
TEST_F(AudioServiceLifetimeConnectorTest,
@@ -215,7 +215,7 @@
connector_->BindInterface(mojom::kServiceName, &info2);
EXPECT_TRUE(info2.is_bound());
- scoped_task_environment_.FastForwardBy(kQuitTimeout);
+ task_environment_.FastForwardBy(kQuitTimeout);
EXPECT_TRUE(info2.is_bound());
}
@@ -231,21 +231,21 @@
connector_->BindInterface(mojom::kServiceName, &info2);
EXPECT_TRUE(info2.is_bound());
- scoped_task_environment_.FastForwardBy(kQuitTimeout);
+ task_environment_.FastForwardBy(kQuitTimeout);
EXPECT_TRUE(info1.is_bound());
EXPECT_TRUE(info2.is_bound());
info1.reset();
EXPECT_TRUE(info2.is_bound());
- scoped_task_environment_.FastForwardBy(kQuitTimeout);
+ task_environment_.FastForwardBy(kQuitTimeout);
EXPECT_FALSE(info1.is_bound());
EXPECT_TRUE(info2.is_bound());
}
// Now disconnect the last client and wait for service quit request.
EXPECT_CALL(quit_request_, Run()).Times(Exactly(1));
info2.reset();
- scoped_task_environment_.FastForwardBy(kQuitTimeout);
+ task_environment_.FastForwardBy(kQuitTimeout);
}
TEST_F(AudioServiceLifetimeConnectorTest,
@@ -258,15 +258,15 @@
connector_->BindInterface(mojom::kServiceName, &info1);
EXPECT_TRUE(info1.is_bound());
info1.reset();
- scoped_task_environment_.FastForwardBy(kQuitTimeout * 0.75);
+ task_environment_.FastForwardBy(kQuitTimeout * 0.75);
connector_->BindInterface(mojom::kServiceName, &info2);
EXPECT_TRUE(info2.is_bound());
info2.reset();
- scoped_task_environment_.FastForwardBy(kQuitTimeout * 0.75);
+ task_environment_.FastForwardBy(kQuitTimeout * 0.75);
}
EXPECT_CALL(quit_request_, Run()).Times(Exactly(1));
- scoped_task_environment_.FastForwardBy(kQuitTimeout * 0.25);
+ task_environment_.FastForwardBy(kQuitTimeout * 0.25);
}
} // namespace audio
diff --git a/services/audio/test/standalone_service_test.cc b/services/audio/test/standalone_service_test.cc
index 9a49592..eb09631 100644
--- a/services/audio/test/standalone_service_test.cc
+++ b/services/audio/test/standalone_service_test.cc
@@ -51,7 +51,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestServiceManager test_service_manager_;
service_manager::TestService test_service_;
diff --git a/services/content/public/cpp/test/fake_navigable_contents_factory_unittest.cc b/services/content/public/cpp/test/fake_navigable_contents_factory_unittest.cc
index b8e5d56..fa95592 100644
--- a/services/content/public/cpp/test/fake_navigable_contents_factory_unittest.cc
+++ b/services/content/public/cpp/test/fake_navigable_contents_factory_unittest.cc
@@ -34,7 +34,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::Remote<mojom::NavigableContentsFactory> remote_factory_;
FakeNavigableContentsFactory factory_;
diff --git a/services/content/service_unittest.cc b/services/content/service_unittest.cc
index c4e9c1a..fd41e75 100644
--- a/services/content/service_unittest.cc
+++ b/services/content/service_unittest.cc
@@ -129,7 +129,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory connector_factory_;
TestServiceDelegate delegate_;
Service service_;
diff --git a/services/data_decoder/bundled_exchanges_parser_factory_unittest.cc b/services/data_decoder/bundled_exchanges_parser_factory_unittest.cc
index 814d210..3c71ed8 100644
--- a/services/data_decoder/bundled_exchanges_parser_factory_unittest.cc
+++ b/services/data_decoder/bundled_exchanges_parser_factory_unittest.cc
@@ -52,7 +52,7 @@
private:
std::unique_ptr<BundledExchangesParserFactory> factory_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BundledExchangesParserFactoryTest, GetSize) {
diff --git a/services/data_decoder/bundled_exchanges_parser_unittest.cc b/services/data_decoder/bundled_exchanges_parser_unittest.cc
index cf32b07..03fbdec 100644
--- a/services/data_decoder/bundled_exchanges_parser_unittest.cc
+++ b/services/data_decoder/bundled_exchanges_parser_unittest.cc
@@ -256,7 +256,7 @@
class BundledExchangeParserTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BundledExchangeParserTest, WrongMagic) {
diff --git a/services/data_decoder/image_decoder_impl_unittest.cc b/services/data_decoder/image_decoder_impl_unittest.cc
index bea5c2fb..db0c29ef 100644
--- a/services/data_decoder/image_decoder_impl_unittest.cc
+++ b/services/data_decoder/image_decoder_impl_unittest.cc
@@ -108,7 +108,7 @@
ImageDecoderImpl* decoder() { return &decoder_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ImageDecoderImpl decoder_;
};
diff --git a/services/data_decoder/public/cpp/json_sanitizer_unittest.cc b/services/data_decoder/public/cpp/json_sanitizer_unittest.cc
index aec6663..9332497 100644
--- a/services/data_decoder/public/cpp/json_sanitizer_unittest.cc
+++ b/services/data_decoder/public/cpp/json_sanitizer_unittest.cc
@@ -46,7 +46,7 @@
void OnSuccess(const std::string& json);
void OnError(const std::string& error);
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
#if !defined(OS_ANDROID)
TestingJsonParser::ScopedFactoryOverride factory_override_;
diff --git a/services/data_decoder/public/cpp/safe_bundled_exchanges_parser_unittest.cc b/services/data_decoder/public/cpp/safe_bundled_exchanges_parser_unittest.cc
index 6446f20..7f8c63a1 100644
--- a/services/data_decoder/public/cpp/safe_bundled_exchanges_parser_unittest.cc
+++ b/services/data_decoder/public/cpp/safe_bundled_exchanges_parser_unittest.cc
@@ -122,7 +122,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestDataDecoderService service_;
};
diff --git a/services/data_decoder/public/cpp/testing_json_parser_unittest.cc b/services/data_decoder/public/cpp/testing_json_parser_unittest.cc
index 16903a8d..910c611 100644
--- a/services/data_decoder/public/cpp/testing_json_parser_unittest.cc
+++ b/services/data_decoder/public/cpp/testing_json_parser_unittest.cc
@@ -56,7 +56,7 @@
EXPECT_FALSE(error.empty());
}
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
TestingJsonParser::ScopedFactoryOverride factory_override_;
bool did_success_ = false;
bool did_error_ = false;
diff --git a/services/device/device_service_test_base.h b/services/device/device_service_test_base.h
index 2343cf2..0bdf9c2b 100644
--- a/services/device/device_service_test_base.h
+++ b/services/device/device_service_test_base.h
@@ -38,7 +38,7 @@
// by the child test fixture.
void DestroyDeviceService();
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Both of these task runners should be deprecated in favor of individual
// components of the device service creating their own.
diff --git a/services/device/fingerprint/fingerprint_chromeos_unittest.cc b/services/device/fingerprint/fingerprint_chromeos_unittest.cc
index 380c845..40454f1 100644
--- a/services/device/fingerprint/fingerprint_chromeos_unittest.cc
+++ b/services/device/fingerprint/fingerprint_chromeos_unittest.cc
@@ -125,7 +125,7 @@
int get_records_results() { return get_records_results_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FingerprintChromeOS> fingerprint_;
int get_records_results_ = 0;
diff --git a/services/device/generic_sensor/absolute_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_magnetometer_unittest.cc b/services/device/generic_sensor/absolute_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_magnetometer_unittest.cc
index b11a5ed..6e1562a 100644
--- a/services/device/generic_sensor/absolute_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_magnetometer_unittest.cc
+++ b/services/device/generic_sensor/absolute_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_magnetometer_unittest.cc
@@ -67,7 +67,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
AbsoluteOrientationEulerAnglesFusionAlgorithmUsingAccelerometerAndMagnetometer*
fusion_algorithm_;
diff --git a/services/device/generic_sensor/linear_acceleration_fusion_algorithm_using_accelerometer_unittest.cc b/services/device/generic_sensor/linear_acceleration_fusion_algorithm_using_accelerometer_unittest.cc
index cd59e453..0943181d 100644
--- a/services/device/generic_sensor/linear_acceleration_fusion_algorithm_using_accelerometer_unittest.cc
+++ b/services/device/generic_sensor/linear_acceleration_fusion_algorithm_using_accelerometer_unittest.cc
@@ -106,7 +106,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
LinearAccelerationFusionAlgorithmUsingAccelerometer* fusion_algorithm_;
};
diff --git a/services/device/generic_sensor/orientation_euler_angles_fusion_algorithm_using_quaternion_unittest.cc b/services/device/generic_sensor/orientation_euler_angles_fusion_algorithm_using_quaternion_unittest.cc
index 4e88022..4554953 100644
--- a/services/device/generic_sensor/orientation_euler_angles_fusion_algorithm_using_quaternion_unittest.cc
+++ b/services/device/generic_sensor/orientation_euler_angles_fusion_algorithm_using_quaternion_unittest.cc
@@ -26,7 +26,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
OrientationEulerAnglesFusionAlgorithmUsingQuaternion* fusion_algorithm_;
};
diff --git a/services/device/generic_sensor/orientation_quaternion_fusion_algorithm_using_euler_angles_unittest.cc b/services/device/generic_sensor/orientation_quaternion_fusion_algorithm_using_euler_angles_unittest.cc
index 6622334..76d4a7c 100644
--- a/services/device/generic_sensor/orientation_quaternion_fusion_algorithm_using_euler_angles_unittest.cc
+++ b/services/device/generic_sensor/orientation_quaternion_fusion_algorithm_using_euler_angles_unittest.cc
@@ -28,7 +28,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
OrientationQuaternionFusionAlgorithmUsingEulerAngles* fusion_algorithm_;
};
diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest.cc b/services/device/generic_sensor/platform_sensor_and_provider_unittest.cc
index cfb1558b..87d90a5 100644
--- a/services/device/generic_sensor/platform_sensor_and_provider_unittest.cc
+++ b/services/device/generic_sensor/platform_sensor_and_provider_unittest.cc
@@ -26,7 +26,7 @@
std::unique_ptr<FakePlatformSensorProvider> provider_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(PlatformSensorProviderTest);
};
diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc b/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
index 19f90a3..701bd74 100644
--- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
+++ b/services/device/generic_sensor/platform_sensor_and_provider_unittest_linux.cc
@@ -282,7 +282,7 @@
ASSERT_TRUE(success);
// Make sure all tasks have been delivered (including SensorDeviceManager
// notifying PlatformSensorProviderLinux of a device addition).
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Generates a "remove device" event by removed sensors' directory and
@@ -298,10 +298,10 @@
ASSERT_TRUE(success);
// Make sure all tasks have been delivered (including SensorDeviceManager
// notifying PlatformSensorProviderLinux of a device removal).
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockSensorDeviceManager* manager_;
std::unique_ptr<PlatformSensorProviderLinux> provider_;
diff --git a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc b/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc
index cc62c56..25fd0cf 100644
--- a/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc
+++ b/services/device/generic_sensor/platform_sensor_and_provider_unittest_win.cc
@@ -191,8 +191,7 @@
class PlatformSensorAndProviderTestWin : public ::testing::Test {
public:
PlatformSensorAndProviderTestWin()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
void SetUp() override {
sensor_ = new NiceMock<MockISensor>();
@@ -287,7 +286,7 @@
events->AddRef();
sensor_events_.Attach(events);
if (this->run_loop_) {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&PlatformSensorAndProviderTestWin::QuitInnerLoop,
base::Unretained(this)));
@@ -301,7 +300,7 @@
.WillByDefault(Invoke([this](ISensorEvents* events) {
sensor_events_.Reset();
if (this->run_loop_) {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&PlatformSensorAndProviderTestWin::QuitInnerLoop,
base::Unretained(this)));
@@ -382,7 +381,7 @@
}
base::win::ScopedCOMInitializer com_initializer_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockISensorManager> sensor_manager_;
scoped_refptr<MockISensorCollection> sensor_collection_;
scoped_refptr<MockISensor> sensor_;
diff --git a/services/device/generic_sensor/platform_sensor_fusion_unittest.cc b/services/device/generic_sensor/platform_sensor_fusion_unittest.cc
index 3a48154..aa39c86 100644
--- a/services/device/generic_sensor/platform_sensor_fusion_unittest.cc
+++ b/services/device/generic_sensor/platform_sensor_fusion_unittest.cc
@@ -90,7 +90,7 @@
EXPECT_TRUE(platform_sensor_fusion_callback_called_);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<FakePlatformSensorProvider> provider_;
bool accelerometer_callback_called_ = false;
scoped_refptr<FakePlatformSensor> accelerometer_;
diff --git a/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc b/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc
index bdda78f..9017053 100644
--- a/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc
+++ b/services/device/generic_sensor/platform_sensor_provider_winrt_unittest.cc
@@ -43,7 +43,7 @@
// Tests that PlatformSensorProviderWinrt can successfully be instantiated
// and passes the correct result to the CreateSensor callback.
TEST(PlatformSensorProviderTestWinrt, SensorCreationReturnCheck) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
auto mock_sensor_reader_factory =
std::make_unique<testing::NiceMock<MockSensorReaderFactory>>();
@@ -103,4 +103,4 @@
run_loop->Run();
}
-} // namespace device
\ No newline at end of file
+} // namespace device
diff --git a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc
index 8ffe5bca..cd1d971 100644
--- a/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc
+++ b/services/device/generic_sensor/platform_sensor_reader_winrt_unittests.cc
@@ -541,7 +541,7 @@
class PlatformSensorReaderTestWinrt : public testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::win::ScopedCOMInitializer scoped_com_initializer_;
};
@@ -1299,4 +1299,4 @@
fake_sensor->TriggerFakeSensorReading(reading);
}
-} // namespace device
\ No newline at end of file
+} // namespace device
diff --git a/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_gyroscope_unittest.cc b/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_gyroscope_unittest.cc
index 8d99ff0c..838d542 100644
--- a/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_gyroscope_unittest.cc
+++ b/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_and_gyroscope_unittest.cc
@@ -69,7 +69,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
RelativeOrientationEulerAnglesFusionAlgorithmUsingAccelerometerAndGyroscope*
fusion_algorithm_;
diff --git a/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_unittest.cc b/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_unittest.cc
index 4c589f4..68300ac 100644
--- a/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_unittest.cc
+++ b/services/device/generic_sensor/relative_orientation_euler_angles_fusion_algorithm_using_accelerometer_unittest.cc
@@ -55,7 +55,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FakePlatformSensorFusion> fake_fusion_sensor_;
RelativeOrientationEulerAnglesFusionAlgorithmUsingAccelerometer*
fusion_algorithm_;
diff --git a/services/device/geolocation/geolocation_provider_impl_unittest.cc b/services/device/geolocation/geolocation_provider_impl_unittest.cc
index e941bcf..fa03439 100644
--- a/services/device/geolocation/geolocation_provider_impl_unittest.cc
+++ b/services/device/geolocation/geolocation_provider_impl_unittest.cc
@@ -102,8 +102,7 @@
class GeolocationProviderTest : public testing::Test {
protected:
GeolocationProviderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
arbitrator_(new FakeLocationProvider) {
provider()->SetArbitratorForTesting(base::WrapUnique(arbitrator_));
}
@@ -129,7 +128,7 @@
// test completes.
base::ShadowingAtExitManager at_exit_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ThreadChecker thread_checker_;
diff --git a/services/device/geolocation/location_arbitrator_unittest.cc b/services/device/geolocation/location_arbitrator_unittest.cc
index 2cbf5089..87b86b4 100644
--- a/services/device/geolocation/location_arbitrator_unittest.cc
+++ b/services/device/geolocation/location_arbitrator_unittest.cc
@@ -162,7 +162,7 @@
const std::unique_ptr<MockLocationObserver> observer_;
std::unique_ptr<TestingLocationArbitrator> arbitrator_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory_;
};
diff --git a/services/device/geolocation/network_location_provider_unittest.cc b/services/device/geolocation/network_location_provider_unittest.cc
index c23e11e..6ecb51d 100644
--- a/services/device/geolocation/network_location_provider_unittest.cc
+++ b/services/device/geolocation/network_location_provider_unittest.cc
@@ -284,7 +284,7 @@
}
}
- const base::test::ScopedTaskEnvironment scoped_task_environment_;
+ const base::test::TaskEnvironment task_environment_;
network::TestURLLoaderFactory test_url_loader_factory_;
const scoped_refptr<MockWifiDataProvider> wifi_data_provider_;
FakePositionCache position_cache_;
diff --git a/services/device/geolocation/position_cache_impl_perftest.cc b/services/device/geolocation/position_cache_impl_perftest.cc
index 9a80117..fe5cce7 100644
--- a/services/device/geolocation/position_cache_impl_perftest.cc
+++ b/services/device/geolocation/position_cache_impl_perftest.cc
@@ -20,8 +20,7 @@
class PositionCacheImplPerfTest : public ::testing::Test {
public:
PositionCacheImplPerfTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
cache_(task_environment_.GetMockTickClock()) {}
void SetUp() override {
@@ -34,7 +33,7 @@
protected:
static constexpr size_t kBatchSize = 5000;
std::vector<std::pair<WifiData, mojom::Geoposition>> data_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
PositionCacheImpl cache_;
};
diff --git a/services/device/geolocation/position_cache_impl_unittest.cc b/services/device/geolocation/position_cache_impl_unittest.cc
index a7815f6..df3fd2de 100644
--- a/services/device/geolocation/position_cache_impl_unittest.cc
+++ b/services/device/geolocation/position_cache_impl_unittest.cc
@@ -20,13 +20,12 @@
class PositionCacheImplTest : public ::testing::Test {
public:
PositionCacheImplTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
cache_(task_environment_.GetMockTickClock()) {}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
PositionCacheImpl cache_;
};
diff --git a/services/device/geolocation/public_ip_address_geolocator_unittest.cc b/services/device/geolocation/public_ip_address_geolocator_unittest.cc
index 0fb69356..ba36854 100644
--- a/services/device/geolocation/public_ip_address_geolocator_unittest.cc
+++ b/services/device/geolocation/public_ip_address_geolocator_unittest.cc
@@ -25,8 +25,7 @@
class PublicIpAddressGeolocatorTest : public testing::Test {
public:
PublicIpAddressGeolocatorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_connection_tracker_(
network::TestNetworkConnectionTracker::CreateInstance()) {
notifier_.reset(new PublicIpAddressLocationNotifier(
@@ -92,7 +91,7 @@
mojo::StrongBindingSet<mojom::Geolocation> binding_set_;
// Test task runner.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// List of any Mojo bad-message errors raised.
std::vector<std::string> bad_messages_;
diff --git a/services/device/geolocation/public_ip_address_location_notifier_unittest.cc b/services/device/geolocation/public_ip_address_location_notifier_unittest.cc
index 0ad5b6c..cfb03615 100644
--- a/services/device/geolocation/public_ip_address_location_notifier_unittest.cc
+++ b/services/device/geolocation/public_ip_address_location_notifier_unittest.cc
@@ -85,7 +85,7 @@
std::string body =
base::StringPrintf(kNetworkResponseFormatString, latitude);
test_url_loader_factory_.AddResponse(request_url, body, net::HTTP_OK);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_url_loader_factory_.ClearResponses();
}
@@ -102,7 +102,7 @@
test_url_loader_factory_.AddResponse(request_url, std::string(),
net::HTTP_INTERNAL_SERVER_ERROR);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_url_loader_factory_.ClearResponses();
}
@@ -122,8 +122,8 @@
}
// Use a TaskRunner on which we can fast-forward time.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
// Test NetworkConnectionTracker instance.
std::unique_ptr<network::TestNetworkConnectionTracker>
@@ -198,7 +198,7 @@
network::TestNetworkConnectionTracker::GetInstance()->SetConnectionType(
network::mojom::ConnectionType::CONNECTION_UNKNOWN);
// Wait for the notifier to complete its delayed reaction.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
// Now expect a network request and query_2 to return.
RespondToFetchWithLatitude(2.0f);
@@ -230,14 +230,14 @@
for (int i = 0; i < 10; ++i) {
network::TestNetworkConnectionTracker::GetInstance()->SetConnectionType(
network::mojom::ConnectionType::CONNECTION_UNKNOWN);
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(5));
}
// Expect still no network request or callback.
EXPECT_EQ(0, test_url_loader_factory_.NumPending());
EXPECT_FALSE(query_2.position().has_value());
// Wait longer.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
// Now expect a network request & query_2 to return.
RespondToFetchWithLatitude(2.0f);
@@ -273,7 +273,7 @@
network::TestNetworkConnectionTracker::GetInstance()->SetConnectionType(
network::mojom::ConnectionType::CONNECTION_UNKNOWN);
// Wait for the notifier to complete its delayed reaction.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
// Now expect a network request & fake a valid response.
RespondToFetchWithLatitude(2.0f);
diff --git a/services/device/geolocation/wifi_data_provider_chromeos_unittest.cc b/services/device/geolocation/wifi_data_provider_chromeos_unittest.cc
index a76e2bdd..737666f2 100644
--- a/services/device/geolocation/wifi_data_provider_chromeos_unittest.cc
+++ b/services/device/geolocation/wifi_data_provider_chromeos_unittest.cc
@@ -19,8 +19,7 @@
class GeolocationChromeOsWifiDataProviderTest : public testing::Test {
protected:
GeolocationChromeOsWifiDataProviderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void SetUp() override {
chromeos::shill_clients::InitializeFakes();
@@ -59,7 +58,7 @@
base::RunLoop().RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<WifiDataProviderChromeOs> provider_;
chromeos::ShillManagerClient* manager_client_;
chromeos::ShillManagerClient::TestInterface* manager_test_;
diff --git a/services/device/geolocation/wifi_data_provider_common_unittest.cc b/services/device/geolocation/wifi_data_provider_common_unittest.cc
index 26aca3d..629d377 100644
--- a/services/device/geolocation/wifi_data_provider_common_unittest.cc
+++ b/services/device/geolocation/wifi_data_provider_common_unittest.cc
@@ -87,8 +87,7 @@
class GeolocationWifiDataProviderCommonTest : public testing::Test {
public:
GeolocationWifiDataProviderCommonTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
wifi_data_callback_(base::DoNothing()) {}
void TearDownProvider() {
@@ -128,7 +127,7 @@
}
protected:
- const base::test::ScopedTaskEnvironment scoped_task_environment_;
+ const base::test::TaskEnvironment task_environment_;
WifiDataProviderManager::WifiDataUpdateCallback wifi_data_callback_;
scoped_refptr<WifiDataProviderCommonWithMock> provider_;
diff --git a/services/device/geolocation/wifi_data_provider_linux_unittest.cc b/services/device/geolocation/wifi_data_provider_linux_unittest.cc
index 5098e38..cfbba14 100644
--- a/services/device/geolocation/wifi_data_provider_linux_unittest.cc
+++ b/services/device/geolocation/wifi_data_provider_linux_unittest.cc
@@ -97,12 +97,11 @@
protected:
GeolocationWifiDataProviderLinuxTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
// WifiDataProvider requires a task runner to be present. The |message_loop_|
// is defined here, as it should outlive |wifi_provider_linux_|.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<dbus::MockBus> mock_bus_;
scoped_refptr<dbus::MockObjectProxy> mock_network_manager_proxy_;
scoped_refptr<dbus::MockObjectProxy> mock_access_point_proxy_;
diff --git a/services/device/geolocation/wifi_data_provider_win_unittest.cc b/services/device/geolocation/wifi_data_provider_win_unittest.cc
index f3a3476..4baf1cdc 100644
--- a/services/device/geolocation/wifi_data_provider_win_unittest.cc
+++ b/services/device/geolocation/wifi_data_provider_win_unittest.cc
@@ -14,8 +14,8 @@
TEST(GeolocationWifiDataProviderWinTest, CreateDestroy) {
// WifiDataProvider requires a task runner to be present.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
scoped_refptr<WifiDataProviderWin> instance(new WifiDataProviderWin);
instance = NULL;
SUCCEED();
diff --git a/services/device/hid/hid_connection_unittest.cc b/services/device/hid/hid_connection_unittest.cc
index 1c36d49..edfa5cf 100644
--- a/services/device/hid/hid_connection_unittest.cc
+++ b/services/device/hid/hid_connection_unittest.cc
@@ -149,8 +149,7 @@
class HidConnectionTest : public testing::Test {
public:
HidConnectionTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
io_thread_(base::TestIOThread::kAutoStart) {}
protected:
@@ -173,7 +172,7 @@
ASSERT_FALSE(device_guid_.empty());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::TestIOThread io_thread_;
std::unique_ptr<HidService> service_;
std::unique_ptr<UsbTestGadget> test_gadget_;
diff --git a/services/device/hid/hid_service_unittest.cc b/services/device/hid/hid_service_unittest.cc
index 37bf89a..bf99069 100644
--- a/services/device/hid/hid_service_unittest.cc
+++ b/services/device/hid/hid_service_unittest.cc
@@ -16,11 +16,10 @@
class HidServiceTest : public ::testing::Test {
public:
HidServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<HidService> service_;
};
diff --git a/services/device/hid/input_service_linux_unittest.cc b/services/device/hid/input_service_linux_unittest.cc
index 0189809..7d5dd37 100644
--- a/services/device/hid/input_service_linux_unittest.cc
+++ b/services/device/hid/input_service_linux_unittest.cc
@@ -27,8 +27,8 @@
} // namespace
TEST(InputServiceLinux, Simple) {
- base::test::ScopedTaskEnvironment task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
InputServiceLinux* service = InputServiceLinux::GetInstance();
ASSERT_TRUE(service);
diff --git a/services/device/public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc b/services/device/public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc
index f7827a6f..a8bf4e2 100644
--- a/services/device/public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc
+++ b/services/device/public/cpp/power_monitor/power_monitor_broadcast_source_unittest.cc
@@ -35,7 +35,7 @@
return power_monitor_source_ptr_->client_for_testing();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
PowerMonitorBroadcastSource* power_monitor_source_ptr_;
diff --git a/services/device/serial/serial_device_enumerator_unittest.cc b/services/device/serial/serial_device_enumerator_unittest.cc
index 7db84f65..7b9918a 100644
--- a/services/device/serial/serial_device_enumerator_unittest.cc
+++ b/services/device/serial/serial_device_enumerator_unittest.cc
@@ -16,12 +16,11 @@
class SerialDeviceEnumeratorTest : public testing::Test {
public:
SerialDeviceEnumeratorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~SerialDeviceEnumeratorTest() override = default;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(SerialDeviceEnumeratorTest, GetDevices) {
diff --git a/services/device/usb/usb_device_handle_unittest.cc b/services/device/usb/usb_device_handle_unittest.cc
index 0fca89e..547e0972 100644
--- a/services/device/usb/usb_device_handle_unittest.cc
+++ b/services/device/usb/usb_device_handle_unittest.cc
@@ -31,13 +31,12 @@
class UsbDeviceHandleTest : public ::testing::Test {
public:
UsbDeviceHandleTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
usb_service_(UsbService::Create()),
io_thread_(base::TestIOThread::kAutoStart) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<UsbService> usb_service_;
base::TestIOThread io_thread_;
};
diff --git a/services/device/usb/usb_service_unittest.cc b/services/device/usb/usb_service_unittest.cc
index 062244de..71b49cf 100644
--- a/services/device/usb/usb_service_unittest.cc
+++ b/services/device/usb/usb_service_unittest.cc
@@ -25,13 +25,12 @@
class UsbServiceTest : public ::testing::Test {
public:
UsbServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
usb_service_(UsbService::Create()),
io_thread_(base::TestIOThread::kAutoStart) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<UsbService> usb_service_;
base::TestIOThread io_thread_;
};
diff --git a/services/identity/identity_accessor_impl_unittest.cc b/services/identity/identity_accessor_impl_unittest.cc
index 1aa6967..53b7414 100644
--- a/services/identity/identity_accessor_impl_unittest.cc
+++ b/services/identity/identity_accessor_impl_unittest.cc
@@ -106,7 +106,7 @@
identity_accessor_.set_connection_error_handler(handler);
}
- base::test::ScopedTaskEnvironment task_environemnt_;
+ base::test::TaskEnvironment task_environemnt_;
mojom::IdentityAccessorPtr identity_accessor_;
base::Optional<CoreAccountInfo> primary_account_info_;
diff --git a/services/image_annotation/annotator_unittest.cc b/services/image_annotation/annotator_unittest.cc
index 730d4f41..736788a02 100644
--- a/services/image_annotation/annotator_unittest.cc
+++ b/services/image_annotation/annotator_unittest.cc
@@ -384,8 +384,8 @@
// Test that annotation works for one client, and that the cache is populated.
TEST(AnnotatorTest, OcrSuccessAndCache) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -490,8 +490,8 @@
// Test that description annotations are successfully returned.
TEST(AnnotatorTest, DescriptionSuccess) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -597,8 +597,8 @@
// Test that the specialized OCR result takes precedence.
TEST(AnnotatorTest, DoubleOcrResult) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -712,8 +712,8 @@
// Test that HTTP failure is gracefully handled.
TEST(AnnotatorTest, HttpError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -767,8 +767,8 @@
// Test that backend failure is gracefully handled.
TEST(AnnotatorTest, BackendError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -850,8 +850,8 @@
// Test that partial results are returned if the OCR backend fails.
TEST(AnnotatorTest, OcrBackendError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -944,8 +944,8 @@
// Test that partial results are returned if the description backend fails.
TEST(AnnotatorTest, DescriptionBackendError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1034,8 +1034,8 @@
// Test that server failure (i.e. nonsense response) is gracefully handled.
TEST(AnnotatorTest, ServerError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1092,8 +1092,8 @@
// Test that adult content returns an error.
TEST(AnnotatorTest, AdultError) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1167,8 +1167,8 @@
// Test that work is reassigned if a processor fails.
TEST(AnnotatorTest, ProcessorFails) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1247,8 +1247,8 @@
// Test a case that was previously buggy: when one client requests annotations,
// then fails local processing, then another client makes the same request.
TEST(AnnotatorTest, ProcessorFailedPreviously) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1316,8 +1316,8 @@
// Test that work is reassigned if processor dies.
TEST(AnnotatorTest, ProcessorDies) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1391,8 +1391,8 @@
// Test that multiple concurrent requests are handled in the same batch.
TEST(AnnotatorTest, ConcurrentSameBatch) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1478,8 +1478,8 @@
// Test that multiple concurrent requests are handled in separate batches.
TEST(AnnotatorTest, ConcurrentSeparateBatches) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1622,8 +1622,8 @@
// Test that work is not duplicated if it is already ongoing.
TEST(AnnotatorTest, DuplicateWork) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1730,8 +1730,8 @@
// Test that the description engine is not requested for images that violate
// model policy (i.e. are too small or have too-high an aspect ratio).
TEST(AnnotatorTest, DescPolicy) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -1932,8 +1932,8 @@
// Test that description language preferences are sent to the server.
TEST(AnnotatorTest, DescLanguage) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
TestServerURLLoaderFactory test_url_factory(
"https://ia-pa.googleapis.com/v1/");
data_decoder::TestDataDecoderService test_dd_service;
@@ -2126,8 +2126,8 @@
// Test that the specified API key is sent, but only to Google-associated server
// domains.
TEST(AnnotatorTest, ApiKey) {
- base::test::ScopedTaskEnvironment test_task_env(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME);
+ base::test::TaskEnvironment test_task_env(
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME);
data_decoder::TestDataDecoderService test_dd_service;
// A call to a secure Google-owner server URL should include the specified API
diff --git a/services/image_annotation/public/cpp/image_processor_unittest.cc b/services/image_annotation/public/cpp/image_processor_unittest.cc
index 38154df..a1d049d 100644
--- a/services/image_annotation/public/cpp/image_processor_unittest.cc
+++ b/services/image_annotation/public/cpp/image_processor_unittest.cc
@@ -91,7 +91,7 @@
} // namespace
TEST(ImageProcessorTest, NullImage) {
- base::test::ScopedTaskEnvironment test_task_env;
+ base::test::TaskEnvironment test_task_env;
base::HistogramTester histogram_tester;
bool empty_bytes = false;
@@ -114,7 +114,7 @@
}
TEST(ImageProcessorTest, ImageContent) {
- base::test::ScopedTaskEnvironment test_task_env;
+ base::test::TaskEnvironment test_task_env;
base::HistogramTester histogram_tester;
// Create one image that doesn't need scaling and one image that does.
diff --git a/services/media_session/audio_focus_manager_unittest.cc b/services/media_session/audio_focus_manager_unittest.cc
index 05e576c..33b0150 100644
--- a/services/media_session/audio_focus_manager_unittest.cc
+++ b/services/media_session/audio_focus_manager_unittest.cc
@@ -264,7 +264,7 @@
audio_focus_remote_.FlushForTesting();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::HistogramTester histogram_tester_;
service_manager::TestConnectorFactory connector_factory_;
diff --git a/services/media_session/media_controller_unittest.cc b/services/media_session/media_controller_unittest.cc
index 9ca1c27a..f6a74e5 100644
--- a/services/media_session/media_controller_unittest.cc
+++ b/services/media_session/media_controller_unittest.cc
@@ -69,7 +69,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory connector_factory_;
std::unique_ptr<MediaSessionService> service_;
mojo::Remote<mojom::AudioFocusManager> audio_focus_remote_;
diff --git a/services/media_session/media_session_service_unittest.cc b/services/media_session/media_session_service_unittest.cc
index 67e8455..27347914 100644
--- a/services/media_session/media_session_service_unittest.cc
+++ b/services/media_session/media_session_service_unittest.cc
@@ -17,7 +17,7 @@
~MediaSessionTest() override = default;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(MediaSessionTest);
};
diff --git a/services/network/cert_verifier_with_trust_anchors_unittest.cc b/services/network/cert_verifier_with_trust_anchors_unittest.cc
index e7e1d6f1..343a3623 100644
--- a/services/network/cert_verifier_with_trust_anchors_unittest.cc
+++ b/services/network/cert_verifier_with_trust_anchors_unittest.cc
@@ -35,8 +35,7 @@
CertVerifierWithTrustAnchorsTest()
: trust_anchor_used_(false),
test_nss_user_("user1"),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~CertVerifierWithTrustAnchorsTest() override {}
@@ -132,7 +131,7 @@
bool trust_anchor_used_;
crypto::ScopedTestNSSChromeOSUser test_nss_user_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(CertVerifierWithTrustAnchorsTest, VerifyUntrustedCert) {
diff --git a/services/network/chunked_data_pipe_upload_data_stream_unittest.cc b/services/network/chunked_data_pipe_upload_data_stream_unittest.cc
index dfb0872..13c0b44 100644
--- a/services/network/chunked_data_pipe_upload_data_stream_unittest.cc
+++ b/services/network/chunked_data_pipe_upload_data_stream_unittest.cc
@@ -55,8 +55,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::unique_ptr<TestChunkedDataPipeGetter> chunked_data_pipe_getter_;
std::unique_ptr<ChunkedDataPipeUploadDataStream> chunked_upload_stream_;
diff --git a/services/network/cookie_manager_unittest.cc b/services/network/cookie_manager_unittest.cc
index d358662a..cf42d91 100644
--- a/services/network/cookie_manager_unittest.cc
+++ b/services/network/cookie_manager_unittest.cc
@@ -316,7 +316,7 @@
&CookieManagerTest::OnConnectionError, base::Unretained(this)));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
void OnConnectionError() { connection_error_seen_ = true; }
@@ -2118,8 +2118,8 @@
scoped_refptr<SessionCleanupCookieStore> CreateCookieStore() {
auto sqlite_store = base::MakeRefCounted<net::SQLitePersistentCookieStore>(
temp_dir_.GetPath().Append(kTestCookiesFilename),
- scoped_task_environment_.GetMainThreadTaskRunner(),
- background_task_runner_, true, nullptr);
+ task_environment_.GetMainThreadTaskRunner(), background_task_runner_,
+ true, nullptr);
return base::MakeRefCounted<SessionCleanupCookieStore>(sqlite_store.get());
}
diff --git a/services/network/cors/cors_url_loader_factory_unittest.cc b/services/network/cors/cors_url_loader_factory_unittest.cc
index a03918d..a1aaee2 100644
--- a/services/network/cors/cors_url_loader_factory_unittest.cc
+++ b/services/network/cors/cors_url_loader_factory_unittest.cc
@@ -38,8 +38,7 @@
class CorsURLLoaderFactoryTest : public testing::Test {
public:
CorsURLLoaderFactoryTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
resource_scheduler_(true) {
net::URLRequestContextBuilder context_builder;
context_builder.set_proxy_resolution_service(
@@ -91,7 +90,7 @@
base::test::ScopedFeatureList feature_list_;
// Test environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::URLRequestContext> url_request_context_;
ResourceScheduler resource_scheduler_;
std::unique_ptr<NetworkService> network_service_;
diff --git a/services/network/cors/cors_url_loader_unittest.cc b/services/network/cors/cors_url_loader_unittest.cc
index 1c9bbba..2a96cf9d 100644
--- a/services/network/cors/cors_url_loader_unittest.cc
+++ b/services/network/cors/cors_url_loader_unittest.cc
@@ -142,8 +142,7 @@
using ReferrerPolicy = net::URLRequest::ReferrerPolicy;
CorsURLLoaderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
resource_scheduler_(true) {
net::URLRequestContextBuilder context_builder;
context_builder.set_proxy_resolution_service(
@@ -355,7 +354,7 @@
base::test::ScopedFeatureList feature_list_;
// Test environment.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::URLRequestContext> url_request_context_;
ResourceScheduler resource_scheduler_;
std::unique_ptr<NetworkService> network_service_;
diff --git a/services/network/cors/preflight_controller_unittest.cc b/services/network/cors/preflight_controller_unittest.cc
index e392cc1..f4696f2 100644
--- a/services/network/cors/preflight_controller_unittest.cc
+++ b/services/network/cors/preflight_controller_unittest.cc
@@ -221,8 +221,7 @@
class PreflightControllerTest : public testing::Test {
public:
PreflightControllerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
mojom::NetworkServicePtr network_service_ptr;
mojom::NetworkServiceRequest network_service_request =
mojo::MakeRequest(&network_service_ptr);
@@ -310,7 +309,7 @@
return response;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> run_loop_;
std::unique_ptr<mojom::NetworkService> network_service_;
diff --git a/services/network/cross_origin_read_blocking_unittest.cc b/services/network/cross_origin_read_blocking_unittest.cc
index 66d63ba..8b31a4a 100644
--- a/services/network/cross_origin_read_blocking_unittest.cc
+++ b/services/network/cross_origin_read_blocking_unittest.cc
@@ -2140,7 +2140,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::TestURLRequestContext context_;
net::TestDelegate delegate_;
diff --git a/services/network/data_pipe_element_reader_unittest.cc b/services/network/data_pipe_element_reader_unittest.cc
index 599c342..f5a825c1 100644
--- a/services/network/data_pipe_element_reader_unittest.cc
+++ b/services/network/data_pipe_element_reader_unittest.cc
@@ -91,8 +91,8 @@
: element_reader_(nullptr, data_pipe_getter_.GetDataPipeGetterPtr()) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
PassThroughDataPipeGetter data_pipe_getter_;
DataPipeElementReader element_reader_;
};
diff --git a/services/network/dns_config_change_manager_unittest.cc b/services/network/dns_config_change_manager_unittest.cc
index 08945fa..343e43c 100644
--- a/services/network/dns_config_change_manager_unittest.cc
+++ b/services/network/dns_config_change_manager_unittest.cc
@@ -62,7 +62,7 @@
TestDnsConfigChangeManagerClient* client() { return &client_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::NetworkChangeNotifier> notifier_mock_ =
net::NetworkChangeNotifier::CreateMock();
DnsConfigChangeManager manager_;
diff --git a/services/network/expect_ct_reporter_unittest.cc b/services/network/expect_ct_reporter_unittest.cc
index 3582294..e70d104 100644
--- a/services/network/expect_ct_reporter_unittest.cc
+++ b/services/network/expect_ct_reporter_unittest.cc
@@ -291,8 +291,7 @@
class ExpectCTReporterWaitTest : public ::testing::Test {
public:
ExpectCTReporterWaitTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
void SetUp() override {
// Initializes URLRequestContext after the thread is set up.
@@ -326,7 +325,7 @@
private:
TestExpectCTNetworkDelegate network_delegate_;
std::unique_ptr<net::TestURLRequestContext> context_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(ExpectCTReporterWaitTest);
};
@@ -381,8 +380,7 @@
{"Access-Control-Allow-Headers", "content-type,another-header"}};
ExpectCTReporterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~ExpectCTReporterTest() override {}
protected:
@@ -443,7 +441,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::EmbeddedTestServer report_server_;
};
diff --git a/services/network/host_resolver_unittest.cc b/services/network/host_resolver_unittest.cc
index a87fc24..81eb261 100644
--- a/services/network/host_resolver_unittest.cc
+++ b/services/network/host_resolver_unittest.cc
@@ -37,11 +37,10 @@
class HostResolverTest : public testing::Test {
public:
HostResolverTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
net::IPEndPoint CreateExpectedEndPoint(const std::string& address,
diff --git a/services/network/http_cache_data_counter_unittest.cc b/services/network/http_cache_data_counter_unittest.cc
index 0f4a804..d5236dd 100644
--- a/services/network/http_cache_data_counter_unittest.cc
+++ b/services/network/http_cache_data_counter_unittest.cc
@@ -61,8 +61,7 @@
class HttpCacheDataCounterTest : public testing::Test {
public:
HttpCacheDataCounterTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_service_(NetworkService::CreateForTesting()) {}
~HttpCacheDataCounterTest() override = default;
@@ -104,7 +103,7 @@
ASSERT_TRUE(base::Time::FromString(test_entry.date, &time));
entry->SetLastUsedTimeForTest(time);
entry->Close();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
}
@@ -183,7 +182,7 @@
std::move(context_params));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir cache_dir_;
std::unique_ptr<NetworkService> network_service_;
std::unique_ptr<NetworkContext> network_context_;
@@ -215,8 +214,8 @@
// Return the sensible thing (0 bytes used) when there is no cache.
TEST(HttpCacheDataCounterTestNoCache, BeSensible) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
std::unique_ptr<NetworkService> network_service(
NetworkService::CreateForTesting());
std::unique_ptr<NetworkContext> network_context;
diff --git a/services/network/http_cache_data_remover_unittest.cc b/services/network/http_cache_data_remover_unittest.cc
index db46765..6870cff2 100644
--- a/services/network/http_cache_data_remover_unittest.cc
+++ b/services/network/http_cache_data_remover_unittest.cc
@@ -69,8 +69,7 @@
class HttpCacheDataRemoverTest : public testing::Test {
public:
HttpCacheDataRemoverTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_service_(NetworkService::CreateForTesting()) {}
~HttpCacheDataRemoverTest() override = default;
@@ -102,7 +101,7 @@
ASSERT_TRUE(base::Time::FromString(test_entry.date, &time));
entry->SetLastUsedTimeForTest(time);
entry->Close();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
ASSERT_EQ(base::size(kCacheEntries),
static_cast<size_t>(backend_->GetEntryCount()));
@@ -155,7 +154,7 @@
std::move(context_params));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkService> network_service_;
std::unique_ptr<NetworkContext> network_context_;
@@ -338,7 +337,7 @@
// Delete the data remover and make sure after all task have been processed
// that the callback wasn't invoked.
data_remover.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(callback_invoked);
}
diff --git a/services/network/mdns_responder_unittest.cc b/services/network/mdns_responder_unittest.cc
index dd8d31f..1e982cb 100644
--- a/services/network/mdns_responder_unittest.cc
+++ b/services/network/mdns_responder_unittest.cc
@@ -391,8 +391,7 @@
class MdnsResponderTest : public testing::Test {
public:
MdnsResponderTest()
- : failing_socket_factory_(
- scoped_task_environment_.GetMainThreadTaskRunner()) {
+ : failing_socket_factory_(task_environment_.GetMainThreadTaskRunner()) {
Reset();
}
@@ -415,8 +414,7 @@
host_manager_->SetNameGeneratorForTesting(
std::make_unique<SimpleNameGenerator>());
- host_manager_->SetTickClockForTesting(
- scoped_task_environment_.GetMockTickClock());
+ host_manager_->SetTickClockForTesting(task_environment_.GetMockTickClock());
CreateMdnsResponders();
}
@@ -478,14 +476,14 @@
}
void RunUntilNoTasksRemain() {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
void RunFor(base::TimeDelta duration) {
- scoped_task_environment_.FastForwardBy(duration);
+ task_environment_.FastForwardBy(duration);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
// Overrides the current thread task runner, so we can simulate the passage
// of time and avoid any actual sleeps.
NiceMock<net::MockMDnsSocketFactory> socket_factory_;
diff --git a/services/network/mojo_host_resolver_impl_unittest.cc b/services/network/mojo_host_resolver_impl_unittest.cc
index 02b2f68..7e5fac0 100644
--- a/services/network/mojo_host_resolver_impl_unittest.cc
+++ b/services/network/mojo_host_resolver_impl_unittest.cc
@@ -125,7 +125,7 @@
}
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::MockHostResolver mock_host_resolver_;
std::unique_ptr<MojoHostResolverImpl> resolver_service_;
diff --git a/services/network/network_change_manager_unittest.cc b/services/network/network_change_manager_unittest.cc
index fca5f73..d1804fb8 100644
--- a/services/network/network_change_manager_unittest.cc
+++ b/services/network/network_change_manager_unittest.cc
@@ -113,7 +113,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkChangeManager> network_change_manager_;
std::unique_ptr<TestNetworkChangeManagerClient>
network_change_manager_client_;
diff --git a/services/network/network_context_unittest.cc b/services/network/network_context_unittest.cc
index 52c9080..e303ec7 100644
--- a/services/network/network_context_unittest.cc
+++ b/services/network/network_context_unittest.cc
@@ -335,8 +335,7 @@
class NetworkContextTest : public testing::Test {
public:
NetworkContextTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
network_service_(NetworkService::CreateForTesting()) {}
~NetworkContextTest() override {}
@@ -428,7 +427,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
std::unique_ptr<NetworkService> network_service_;
// Stores the NetworkContextPtr of the most recently created NetworkContext.
@@ -840,7 +839,7 @@
CreateContextWithParams(std::move(context_params));
// Wait for properties to load from disk, and sanity check initial state.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(network_context->url_request_context()
->http_server_properties()
->GetSupportsSpdy(kSchemeHostPort));
@@ -852,7 +851,7 @@
// Deleting the context will cause it to flush state. Wait for the pref
// service to flush to disk.
network_context.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Create a new NetworkContext using the same path for HTTP server properties.
context_params = mojom::NetworkContextParams::New();
@@ -860,7 +859,7 @@
network_context = CreateContextWithParams(std::move(context_params));
// Wait for properties to load from disk.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(network_context->url_request_context()
->http_server_properties()
@@ -879,7 +878,7 @@
// Destroy the network context and let any pending writes complete before
// destroying |temp_dir|, to avoid leaking any files.
network_context.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(temp_dir.Delete());
}
@@ -984,7 +983,7 @@
// Destroy the network context, and wait for all tasks to write state to
// disk to finish running.
network_context.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(on_disk,
base::PathExists(transport_security_persister_file_path));
@@ -997,7 +996,7 @@
}
network_context = CreateContextWithParams(std::move(context_params));
// Wait for the entry to load.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
state = network_context->url_request_context()->transport_security_state();
ASSERT_EQ(on_disk, state->GetDynamicSTSState(kDomain, &sts_state));
if (on_disk)
@@ -2220,7 +2219,7 @@
for (const auto& proxy_config_set : proxy_config_sets) {
config_client->OnProxyConfigUpdated(net::ProxyConfigWithAnnotation(
proxy_config_set.proxy_config, TRAFFIC_ANNOTATION_FOR_TESTS));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
TestProxyLookupClient http_proxy_lookup_client2;
http_proxy_lookup_client2.StartLookUpProxyForURL(GURL("http://foo"),
@@ -2288,7 +2287,7 @@
TestProxyLookupClient ftp_proxy_lookup_client;
ftp_proxy_lookup_client.StartLookUpProxyForURL(GURL("ftp://foo/"),
network_context.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(proxy_resolution_service->config());
EXPECT_FALSE(proxy_resolution_service->fetched_config());
EXPECT_FALSE(http_proxy_lookup_client.is_done());
@@ -2326,7 +2325,7 @@
TestProxyLookupClient proxy_lookup_client;
proxy_lookup_client.StartLookUpProxyForURL(GURL("http://foo/"),
network_context.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1u, network_context->pending_proxy_lookup_requests_for_testing());
EXPECT_FALSE(proxy_lookup_client.is_done());
@@ -2353,14 +2352,14 @@
std::make_unique<TestProxyLookupClient>();
proxy_lookup_client->StartLookUpProxyForURL(GURL("http://foo/"),
network_context.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(proxy_lookup_client->is_done());
EXPECT_EQ(1u, network_context->pending_proxy_lookup_requests_for_testing());
// Cancelling the proxy lookup should cause the proxy lookup request objects
// to be deleted.
proxy_lookup_client.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0u, network_context->pending_proxy_lookup_requests_for_testing());
}
@@ -2625,7 +2624,7 @@
net_log_exporter = nullptr;
block_mktemp.Signal();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(base::PathExists(path));
base::DeleteFile(temp_path, false);
@@ -3130,7 +3129,7 @@
// Run a bit to ensure the resolve request makes it to the resolver. Otherwise
// the resolver will be destroyed and close its pipe before it even knows
// about the request to send a failure.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
bool control_handle_closed = false;
auto connection_error_callback =
@@ -5007,7 +5006,7 @@
config->pre_cache_headers.SetHeader("pre_foo", "pre_foo_value");
config->post_cache_headers.SetHeader("post_foo", "post_foo_value");
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.custom_proxy_pre_cache_headers.SetHeader("pre_bar", "pre_bar_value");
@@ -5061,14 +5060,14 @@
// is a redirect loop.
config->can_use_proxy_on_http_url_redirect_cycles = false;
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = kUrl;
request.render_frame_id = kRouteId;
std::unique_ptr<TestURLLoaderClient> client = FetchRedirectedRequest(
kRedirectCycle.size(), request, network_context.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::string response;
EXPECT_TRUE(
mojo::BlockingCopyToString(client->response_body_release(), &response));
@@ -5111,14 +5110,14 @@
// is a redirect loop.
config->can_use_proxy_on_http_url_redirect_cycles = false;
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = kUrl1;
request.render_frame_id = kRouteId;
std::unique_ptr<TestURLLoaderClient> client = FetchRedirectedRequest(
kRedirectCycle.size(), request, network_context.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::string response;
EXPECT_TRUE(
mojo::BlockingCopyToString(client->response_body_release(), &response));
@@ -5146,7 +5145,7 @@
config->pre_cache_headers.SetHeader("foo", "first_foo_key=value1");
config->post_cache_headers.SetHeader("bar", "first_bar_key=value2");
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.custom_proxy_pre_cache_headers.SetHeader("foo",
@@ -5189,7 +5188,7 @@
config->pre_cache_headers.SetHeader("foo", "foo_value");
config->post_cache_headers.SetHeader("bar", "bar_value");
proxy_config_client->OnCustomProxyConfigUpdated(config->Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = GetURLWithMockHost(test_server, "/echoheadercache?foo&bar");
@@ -5207,7 +5206,7 @@
// post_cache_headers should not break caching.
config->post_cache_headers.SetHeader("bar", "new_bar");
proxy_config_client->OnCustomProxyConfigUpdated(config->Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
client = FetchRequest(request, network_context.get());
EXPECT_TRUE(
@@ -5219,7 +5218,7 @@
// pre_cache_headers should invalidate cache.
config->pre_cache_headers.SetHeader("foo", "new_foo");
proxy_config_client->OnCustomProxyConfigUpdated(config->Clone());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
client = FetchRequest(request, network_context.get());
EXPECT_TRUE(
@@ -5249,7 +5248,7 @@
net::ProxyServer proxy_server = ConvertToProxyServer(proxy_test_server);
config->rules.ParseFromString("http=" + proxy_server.ToURI());
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = GetURLWithMockHost(test_server, "/echoheadercache?foo&bar");
@@ -5305,7 +5304,7 @@
config->pre_cache_headers.SetHeader("pre_foo", "bad");
config->post_cache_headers.SetHeader("post_foo", "bad");
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.custom_proxy_pre_cache_headers.SetHeader("pre_bar", "bad");
@@ -5351,7 +5350,7 @@
config->pre_cache_headers.SetHeader("pre_foo", "bad");
config->post_cache_headers.SetHeader("post_foo", "bad");
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.custom_proxy_pre_cache_headers.SetHeader("pre_bar", "bad");
@@ -5386,7 +5385,7 @@
config->rules.ParseFromString(
"http=" + ConvertToProxyServer(proxy_test_server).ToURI());
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = GURL("http://does.not.resolve/echo");
@@ -5451,7 +5450,7 @@
// flag is set.
config->can_use_proxy_on_http_url_redirect_cycles = false;
proxy_config_client->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ResourceRequest request;
request.url = GetURLWithMockHost(test_server, "/echo");
@@ -5459,7 +5458,7 @@
std::unique_ptr<TestURLLoaderClient> client =
FetchRequest(request, network_context.get(), mojom::kURLLoadOptionNone,
test_case.process_id);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
std::string response;
EXPECT_TRUE(
mojo::BlockingCopyToString(client->response_body_release(), &response));
diff --git a/services/network/network_qualities_pref_delegate_unittest.cc b/services/network/network_qualities_pref_delegate_unittest.cc
index 066555bc..13195d7 100644
--- a/services/network/network_qualities_pref_delegate_unittest.cc
+++ b/services/network/network_qualities_pref_delegate_unittest.cc
@@ -26,13 +26,12 @@
class NetworkQualitiesPrefDelegateTest : public testing::Test {
public:
NetworkQualitiesPrefDelegateTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~NetworkQualitiesPrefDelegateTest() override = default;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(NetworkQualitiesPrefDelegateTest);
};
diff --git a/services/network/network_quality_estimator_manager_unittest.cc b/services/network/network_quality_estimator_manager_unittest.cc
index 0aa53001..9efd3a9 100644
--- a/services/network/network_quality_estimator_manager_unittest.cc
+++ b/services/network/network_quality_estimator_manager_unittest.cc
@@ -131,7 +131,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::BoundTestNetLog> net_log_;
std::unique_ptr<NetworkQualityEstimatorManager>
network_quality_estimator_manager_;
diff --git a/services/network/network_service_proxy_delegate_unittest.cc b/services/network/network_service_proxy_delegate_unittest.cc
index d422b32..a74ce0c 100644
--- a/services/network/network_service_proxy_delegate_unittest.cc
+++ b/services/network/network_service_proxy_delegate_unittest.cc
@@ -57,13 +57,13 @@
void SetConfig(mojom::CustomProxyConfigPtr config) {
client_->OnCustomProxyConfigUpdated(std::move(config));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
private:
mojom::CustomProxyConfigClientPtr client_;
std::unique_ptr<net::TestURLRequestContext> context_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(NetworkServiceProxyDelegateTest, NullConfigDoesNotCrash) {
diff --git a/services/network/network_service_unittest.cc b/services/network/network_service_unittest.cc
index aa17b1fb..89a9cacc 100644
--- a/services/network/network_service_unittest.cc
+++ b/services/network/network_service_unittest.cc
@@ -84,8 +84,7 @@
class NetworkServiceTest : public testing::Test {
public:
NetworkServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
service_(NetworkService::CreateForTesting()) {}
~NetworkServiceTest() override {}
@@ -94,7 +93,7 @@
void DestroyService() { service_.reset(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkService> service_;
};
@@ -676,8 +675,7 @@
class NetworkServiceTestWithService : public testing::Test {
public:
NetworkServiceTestWithService()
- : task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~NetworkServiceTestWithService() override {}
void SetUp() override {
@@ -732,7 +730,7 @@
mojom::NetworkContext* context() { return network_context_.get(); }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory test_connector_factory_;
std::unique_ptr<NetworkService> service_;
@@ -1321,8 +1319,7 @@
class NetworkChangeTest : public testing::Test {
public:
NetworkChangeTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
service_(NetworkService::CreateForTesting()) {}
@@ -1331,7 +1328,7 @@
NetworkService* service() const { return service_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
std::unique_ptr<NetworkService> service_;
};
@@ -1353,8 +1350,7 @@
class NetworkServiceNetworkChangeTest : public testing::Test {
public:
NetworkServiceNetworkChangeTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_change_notifier_(net::NetworkChangeNotifier::CreateMock()),
service_(NetworkService::CreateForTesting(
test_connector_factory_.RegisterInstance(kNetworkServiceName))) {
@@ -1367,7 +1363,7 @@
mojom::NetworkService* service() { return network_service_.get(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory test_connector_factory_;
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier_;
std::unique_ptr<NetworkService> service_;
diff --git a/services/network/origin_policy/origin_policy_fetcher_unittest.cc b/services/network/origin_policy/origin_policy_fetcher_unittest.cc
index 8e512d6..dfcb9b4 100644
--- a/services/network/origin_policy/origin_policy_fetcher_unittest.cc
+++ b/services/network/origin_policy/origin_policy_fetcher_unittest.cc
@@ -34,8 +34,7 @@
class OriginPolicyFetcherTest : public testing::Test {
public:
OriginPolicyFetcherTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
network_service_ = NetworkService::CreateForTesting();
auto context_params = mojom::NetworkContextParams::New();
// Use a fixed proxy config, to avoid dependencies on local network
@@ -129,7 +128,7 @@
return std::move(response);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkService> network_service_;
std::unique_ptr<NetworkContext> network_context_;
mojom::NetworkContextPtr network_context_ptr_;
diff --git a/services/network/origin_policy/origin_policy_manager_unittest.cc b/services/network/origin_policy/origin_policy_manager_unittest.cc
index 3b0e2a7..2ca8bda 100644
--- a/services/network/origin_policy/origin_policy_manager_unittest.cc
+++ b/services/network/origin_policy/origin_policy_manager_unittest.cc
@@ -37,8 +37,7 @@
class OriginPolicyManagerTest : public testing::Test {
public:
OriginPolicyManagerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
network_service_ = NetworkService::CreateForTesting();
auto context_params = mojom::NetworkContextParams::New();
@@ -116,7 +115,7 @@
return std::move(response);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkService> network_service_;
std::unique_ptr<NetworkContext> network_context_;
diff --git a/services/network/p2p/socket_tcp_server_unittest.cc b/services/network/p2p/socket_tcp_server_unittest.cc
index 37b4c19..1024208 100644
--- a/services/network/p2p/socket_tcp_server_unittest.cc
+++ b/services/network/p2p/socket_tcp_server_unittest.cc
@@ -117,7 +117,7 @@
return host->socket_.get();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeServerSocket* socket_; // Owned by |p2p_socket_|.
std::unique_ptr<FakeSocketClient> fake_client_;
FakeP2PSocketDelegate socket_delegate_;
diff --git a/services/network/p2p/socket_tcp_unittest.cc b/services/network/p2p/socket_tcp_unittest.cc
index 714be9c..6a1140a 100644
--- a/services/network/p2p/socket_tcp_unittest.cc
+++ b/services/network/p2p/socket_tcp_unittest.cc
@@ -76,7 +76,7 @@
return result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::string sent_data_;
FakeSocket* socket_; // Owned by |socket_impl_|.
std::unique_ptr<P2PSocketTcpBase> socket_impl_;
@@ -465,8 +465,8 @@
// ProxyResolvingClientSocket::Connect() won't be called twice.
// Regression test for crbug.com/840797.
TEST(P2PSocketTcpWithPseudoTlsTest, Basic) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
mojom::P2PSocketClientPtr socket_client;
auto socket_client_request = mojo::MakeRequest(&socket_client);
@@ -525,8 +525,8 @@
// Tests that if a socket type satisfies IsTlsClientSocket(), TLS connection is
// established.
TEST_P(P2PSocketTcpWithTlsTest, Basic) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
mojom::P2PSocketClientPtr socket_client;
auto socket_client_request = mojo::MakeRequest(&socket_client);
diff --git a/services/network/p2p/socket_udp_unittest.cc b/services/network/p2p/socket_udp_unittest.cc
index 3818623..6cf5ed3 100644
--- a/services/network/p2p/socket_udp_unittest.cc
+++ b/services/network/p2p/socket_udp_unittest.cc
@@ -242,7 +242,7 @@
return static_cast<FakeDatagramServerSocket*>(socket_host->socket_.get());
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
P2PMessageThrottler throttler_;
ScopedFakeClock fake_clock_;
base::circular_deque<FakeDatagramServerSocket::UDPPacket> sent_packets_;
diff --git a/services/network/proxy_config_service_mojo_unittest.cc b/services/network/proxy_config_service_mojo_unittest.cc
index 207694c9..5f5fa1e 100644
--- a/services/network/proxy_config_service_mojo_unittest.cc
+++ b/services/network/proxy_config_service_mojo_unittest.cc
@@ -68,8 +68,7 @@
class ProxyConfigServiceMojoTest : public testing::Test {
public:
ProxyConfigServiceMojoTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
proxy_config_service_(mojo::MakeRequest(&config_client_),
base::Optional<net::ProxyConfigWithAnnotation>(),
nullptr),
@@ -84,9 +83,9 @@
protected:
// After notifying a new configuration through |config_client_|, waits for the
// observers to have been notified.
- void WaitForConfig() { scoped_task_environment_.RunUntilIdle(); }
+ void WaitForConfig() { task_environment_.RunUntilIdle(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojom::ProxyConfigClientPtr config_client_;
ProxyConfigServiceMojo proxy_config_service_;
TestProxyConfigServiceObserver observer_;
diff --git a/services/network/proxy_resolver_factory_mojo_unittest.cc b/services/network/proxy_resolver_factory_mojo_unittest.cc
index 19a5d158..7b32137 100644
--- a/services/network/proxy_resolver_factory_mojo_unittest.cc
+++ b/services/network/proxy_resolver_factory_mojo_unittest.cc
@@ -550,7 +550,7 @@
std::move(callback).Run(result);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::HangingHostResolver host_resolver_;
net::TestNetLog net_log_;
std::unique_ptr<MockMojoProxyResolverFactory> mock_proxy_resolver_factory_;
diff --git a/services/network/proxy_resolving_client_socket_unittest.cc b/services/network/proxy_resolving_client_socket_unittest.cc
index 7049ba3..4df40ab 100644
--- a/services/network/proxy_resolving_client_socket_unittest.cc
+++ b/services/network/proxy_resolving_client_socket_unittest.cc
@@ -70,7 +70,7 @@
base::RunLoop().RunUntilIdle();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestURLRequestContextWithProxy context_with_proxy_;
net::MockClientSocketFactory mock_client_socket_factory_;
const bool use_tls_;
@@ -791,7 +791,7 @@
~ReconsiderProxyAfterErrorTest() override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::MockClientSocketFactory mock_client_socket_factory_;
TestURLRequestContextWithProxy context_with_proxy_;
const bool use_tls_;
diff --git a/services/network/proxy_resolving_socket_mojo_unittest.cc b/services/network/proxy_resolving_socket_mojo_unittest.cc
index 9228d61..6ef4a5fd 100644
--- a/services/network/proxy_resolving_socket_mojo_unittest.cc
+++ b/services/network/proxy_resolving_socket_mojo_unittest.cc
@@ -56,8 +56,7 @@
ProxyResolvingSocketTestBase(bool use_tls)
: use_tls_(use_tls),
fake_tls_handshake_(false),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~ProxyResolvingSocketTestBase() {}
@@ -154,7 +153,7 @@
private:
const bool use_tls_;
bool fake_tls_handshake_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::MockClientSocketFactory> mock_client_socket_factory_;
std::unique_ptr<TestURLRequestContextWithProxy> context_with_proxy_;
mojom::ProxyResolvingSocketFactoryPtr factory_ptr_;
diff --git a/services/network/public/cpp/cors/preflight_cache_unittest.cc b/services/network/public/cpp/cors/preflight_cache_unittest.cc
index b61dfdd2..69dfb9a 100644
--- a/services/network/public/cpp/cors/preflight_cache_unittest.cc
+++ b/services/network/public/cpp/cors/preflight_cache_unittest.cc
@@ -53,7 +53,7 @@
void SetUp() override { PreflightResult::SetTickClockForTesting(&clock_); }
void TearDown() override { PreflightResult::SetTickClockForTesting(nullptr); }
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
PreflightCache cache_;
base::SimpleTestTickClock clock_;
};
diff --git a/services/network/public/cpp/cross_thread_shared_url_loader_factory_info_unittest.cc b/services/network/public/cpp/cross_thread_shared_url_loader_factory_info_unittest.cc
index e85c7de4..dd7e9af0 100644
--- a/services/network/public/cpp/cross_thread_shared_url_loader_factory_info_unittest.cc
+++ b/services/network/public/cpp/cross_thread_shared_url_loader_factory_info_unittest.cc
@@ -77,7 +77,7 @@
}
void TearDown() override {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Release |shared_factory_| on |loader_thread_|
base::RunLoop run_loop;
@@ -145,7 +145,7 @@
run_loop.Run();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<CloneCheckingURLLoaderFactory> test_url_loader_factory_;
scoped_refptr<SharedURLLoaderFactory> shared_factory_;
diff --git a/services/network/public/cpp/network_connection_tracker_unittest.cc b/services/network/public/cpp/network_connection_tracker_unittest.cc
index 4887af47..9070e23 100644
--- a/services/network/public/cpp/network_connection_tracker_unittest.cc
+++ b/services/network/public/cpp/network_connection_tracker_unittest.cc
@@ -214,7 +214,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<net::test::MockNetworkChangeNotifier>
mock_network_change_notifier_;
std::unique_ptr<NetworkService> network_service_;
diff --git a/services/network/public/cpp/network_quality_tracker_unittest.cc b/services/network/public/cpp/network_quality_tracker_unittest.cc
index e0e5eb74..5ca2b383 100644
--- a/services/network/public/cpp/network_quality_tracker_unittest.cc
+++ b/services/network/public/cpp/network_quality_tracker_unittest.cc
@@ -167,8 +167,7 @@
class NetworkQualityTrackerTest : public testing::Test {
public:
NetworkQualityTrackerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
network::mojom::NetworkServicePtr network_service_ptr;
network::mojom::NetworkServiceRequest network_service_request =
mojo::MakeRequest(&network_service_ptr);
@@ -211,7 +210,7 @@
return network_service_.get();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<network::NetworkService> network_service_;
std::unique_ptr<NetworkQualityTracker> tracker_;
std::unique_ptr<TestEffectiveConnectionTypeObserver> ect_observer_;
diff --git a/services/network/public/cpp/server/http_server_unittest.cc b/services/network/public/cpp/server/http_server_unittest.cc
index 6351ab5..99cabe9 100644
--- a/services/network/public/cpp/server/http_server_unittest.cc
+++ b/services/network/public/cpp/server/http_server_unittest.cc
@@ -164,8 +164,7 @@
class HttpServerTest : public testing::Test, public HttpServer::Delegate {
public:
HttpServerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
quit_after_request_count_(0),
quit_on_close_connection_(-1),
factory_(nullptr, &url_request_context_) {}
@@ -275,7 +274,7 @@
connection_map_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
size_t quit_after_request_count_;
int quit_on_close_connection_;
diff --git a/services/network/public/cpp/simple_url_loader_unittest.cc b/services/network/public/cpp/simple_url_loader_unittest.cc
index 35aceedd..61bfa496 100644
--- a/services/network/public/cpp/simple_url_loader_unittest.cc
+++ b/services/network/public/cpp/simple_url_loader_unittest.cc
@@ -568,8 +568,7 @@
class SimpleURLLoaderTestBase {
public:
SimpleURLLoaderTestBase()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
network::mojom::NetworkServicePtr network_service_ptr;
network::mojom::NetworkServiceRequest network_service_request =
mojo::MakeRequest(&network_service_ptr);
@@ -628,7 +627,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<network::mojom::NetworkService> network_service_;
std::unique_ptr<network::mojom::NetworkServiceClient> network_service_client_;
@@ -1643,7 +1642,7 @@
test_helper->StartSimpleLoader(url_loader_factory_.get());
test_helper.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_P(SimpleURLLoaderTest, UploadFileCanceledWithRetry) {
@@ -1654,9 +1653,9 @@
test_helper->simple_url_loader()->SetRetryOptions(
2, SimpleURLLoader::RETRY_ON_5XX);
test_helper->StartSimpleLoader(url_loader_factory_.get());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_helper.reset();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
enum class TestLoaderEvent {
@@ -1708,12 +1707,12 @@
// unexpected order, to test handling of events from less trusted processes.
class MockURLLoader : public network::mojom::URLLoader {
public:
- MockURLLoader(base::test::ScopedTaskEnvironment* scoped_task_environment,
+ MockURLLoader(base::test::TaskEnvironment* task_environment,
network::mojom::URLLoaderRequest url_loader_request,
network::mojom::URLLoaderClientPtr client,
std::vector<TestLoaderEvent> test_events,
scoped_refptr<network::ResourceRequestBody> request_body)
- : scoped_task_environment_(scoped_task_environment),
+ : task_environment_(task_environment),
binding_(this, std::move(url_loader_request)),
client_(std::move(client)),
test_events_(std::move(test_events)) {
@@ -1902,13 +1901,12 @@
break;
}
case TestLoaderEvent::kAdvanceOneSecond: {
- scoped_task_environment_->FastForwardBy(
- base::TimeDelta::FromSeconds(1));
+ task_environment_->FastForwardBy(base::TimeDelta::FromSeconds(1));
break;
}
}
// Wait for Mojo to pass along the message, to ensure expected ordering.
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->RunUntilIdle();
}
}
~MockURLLoader() override {}
@@ -1945,7 +1943,7 @@
read_run_loop_->Quit();
}
- base::test::ScopedTaskEnvironment* scoped_task_environment_;
+ base::test::TaskEnvironment* task_environment_;
std::unique_ptr<net::URLRequest> url_request_;
mojo::Binding<network::mojom::URLLoader> binding_;
@@ -1968,9 +1966,8 @@
class MockURLLoaderFactory : public network::mojom::URLLoaderFactory {
public:
- explicit MockURLLoaderFactory(
- base::test::ScopedTaskEnvironment* scoped_task_environment)
- : scoped_task_environment_(scoped_task_environment) {}
+ explicit MockURLLoaderFactory(base::test::TaskEnvironment* task_environment)
+ : task_environment_(task_environment) {}
~MockURLLoaderFactory() override {}
// network::mojom::URLLoaderFactory implementation:
@@ -1986,8 +1983,8 @@
ASSERT_FALSE(test_events_.empty());
requested_urls_.push_back(url_request.url);
url_loaders_.push_back(std::make_unique<MockURLLoader>(
- scoped_task_environment_, std::move(url_loader_request),
- std::move(client), test_events_.front(), url_request.request_body));
+ task_environment_, std::move(url_loader_request), std::move(client),
+ test_events_.front(), url_request.request_body));
test_events_.pop_front();
url_loader_queue_.push_back(url_loaders_.back().get());
@@ -2041,7 +2038,7 @@
const std::list<GURL>& requested_urls() const { return requested_urls_; }
private:
- base::test::ScopedTaskEnvironment* scoped_task_environment_;
+ base::test::TaskEnvironment* task_environment_;
std::list<std::unique_ptr<MockURLLoader>> url_loaders_;
std::list<std::vector<TestLoaderEvent>> test_events_;
@@ -2060,7 +2057,7 @@
// Check that the request fails if OnComplete() is called before anything else.
TEST_P(SimpleURLLoaderTest, ResponseCompleteBeforeReceivedResponse) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kResponseComplete});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
CreateHelperForURL(GURL("foo://bar/"));
@@ -2074,7 +2071,7 @@
// Check that the request fails if OnComplete() is called before the body pipe
// is received.
TEST_P(SimpleURLLoaderTest, ResponseCompleteAfterReceivedResponse) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kResponseComplete});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2087,7 +2084,7 @@
}
TEST_P(SimpleURLLoaderTest, CloseClientPipeBeforeBodyStarts) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kClientPipeClosed});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2134,7 +2131,7 @@
bytes_received < 2) {
continue;
}
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
std::vector<TestLoaderEvent> events;
events.push_back(TestLoaderEvent::kReceivedResponse);
events.push_back(TestLoaderEvent::kBodyBufferReceived);
@@ -2195,7 +2192,7 @@
// Make sure the close client pipe message doesn't cause any issues.
TEST_P(SimpleURLLoaderTest, ErrorAndCloseClientPipeBeforeBodyStarts) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kReceivedResponse,
TestLoaderEvent::kResponseCompleteFailed,
TestLoaderEvent::kClientPipeClosed});
@@ -2210,7 +2207,7 @@
// Make sure the close client pipe message doesn't cause any issues.
TEST_P(SimpleURLLoaderTest, SuccessAndCloseClientPipeBeforeBodyComplete) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kResponseComplete, TestLoaderEvent::kClientPipeClosed,
@@ -2230,7 +2227,7 @@
// Make sure the close client pipe message doesn't cause any issues.
TEST_P(SimpleURLLoaderTest, SuccessAndCloseClientPipeAfterBodyComplete) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kBodyBufferClosed,
@@ -2249,7 +2246,7 @@
}
TEST_P(SimpleURLLoaderTest, DoubleReceivedResponse) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kReceivedResponse});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2262,7 +2259,7 @@
}
TEST_P(SimpleURLLoaderTest, RedirectAfterReseivedResponse) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kReceivedRedirect});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2275,7 +2272,7 @@
}
TEST_P(SimpleURLLoaderTest, UnexpectedBodyBufferReceived) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kBodyBufferReceived});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
CreateHelperForURL(GURL("foo://bar/"));
@@ -2287,7 +2284,7 @@
}
TEST_P(SimpleURLLoaderTest, DoubleBodyBufferReceived) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kReceivedResponse,
TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyBufferReceived});
@@ -2301,7 +2298,7 @@
}
TEST_P(SimpleURLLoaderTest, UnexpectedMessageAfterBodyStarts) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kReceivedRedirect});
@@ -2315,7 +2312,7 @@
}
TEST_P(SimpleURLLoaderTest, UnexpectedMessageAfterBodyStarts2) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kBodyBufferReceived});
@@ -2329,7 +2326,7 @@
}
TEST_P(SimpleURLLoaderTest, UnexpectedMessageAfterBodyComplete) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kBodyBufferClosed,
@@ -2344,7 +2341,7 @@
}
TEST_P(SimpleURLLoaderTest, MoreDataThanExpected) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kBodyDataRead,
@@ -2362,7 +2359,7 @@
TEST_P(SimpleURLLoaderTest, DownloadProgressCallbackIncremental) {
// Make sure that intermediate states of download are reported to the
// progress callback.
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kReceivedResponse, TestLoaderEvent::kBodyBufferReceived,
TestLoaderEvent::kBodyDataRead, TestLoaderEvent::kBodyDataRead});
@@ -2388,7 +2385,7 @@
// Clean the file up.
test_helper->DestroySimpleURLLoader();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_P(SimpleURLLoaderTest, RetryOn5xx) {
@@ -2428,7 +2425,7 @@
};
for (const auto& test_case : kTestCases) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
for (int i = 0; i < test_case.num_5xx; i++) {
loader_factory.AddEvents({TestLoaderEvent::kReceived501Response});
}
@@ -2476,7 +2473,7 @@
// Test that when retrying on 5xx is enabled, there's no retry on a 4xx error.
TEST_P(SimpleURLLoaderTest, NoRetryOn4xx) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kReceived401Response});
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2497,7 +2494,7 @@
// re-requested.
TEST_P(SimpleURLLoaderTest, RetryAfterRedirect) {
const GURL kInitialURL("foo://bar/initial");
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kReceivedRedirect,
TestLoaderEvent::kReceived501Response});
loader_factory.AddEvents(
@@ -2600,7 +2597,7 @@
for (const auto& network_events : kNetworkChangedEvents) {
for (const auto& test_case : kTestCases) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
for (int i = 0; i < test_case.num_network_changes; i++) {
loader_factory.AddEvents(network_events);
}
@@ -2655,7 +2652,7 @@
if (test_loader_event == TestLoaderEvent::kResponseCompleteNetworkChanged)
test_loader_event = TestLoaderEvent::kResponseCompleteFailed;
}
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(modifed_network_events);
std::unique_ptr<SimpleLoaderTestHelper> test_helper =
@@ -2676,7 +2673,7 @@
// Check the case where the URLLoaderFactory has been disconnected before the
// request is retried.
TEST_P(SimpleURLLoaderTest, RetryWithUnboundFactory) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kResponseCompleteNetworkChanged});
// Since clone fails asynchronously, this shouldn't be any different from
// the new URLLoaderFactory being disconnected in some other way.
@@ -2699,7 +2696,7 @@
// with no intervening reads of the data on the pipe.
TEST_P(SimpleURLLoaderTest, UploadLongStringStartReadTwice) {
std::string long_string = GetLongUploadBody();
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kStartReadLongUploadBody,
TestLoaderEvent::kStartReadLongUploadBody,
@@ -2726,7 +2723,7 @@
TEST_P(SimpleURLLoaderTest,
UploadLongStringReadPartOfUploadBodyBeforeRestartBodyRead) {
std::string long_string = GetLongUploadBody();
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kStartReadLongUploadBody,
TestLoaderEvent::kWaitForLongUploadBodySize,
@@ -2851,7 +2848,7 @@
if (body_buffer_closed && client_pipe_closed)
continue;
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
std::vector<TestLoaderEvent> events;
events.push_back(TestLoaderEvent::kReceivedResponse);
events.push_back(TestLoaderEvent::kBodyBufferReceived);
@@ -2872,7 +2869,7 @@
false /* wait_for_completion */);
// Wait for the request to advance as far as it's going to.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Destination file should have been created, and request should still
// be in progress.
@@ -2886,7 +2883,7 @@
// Destroying the SimpleURLLoader now should post a task to destroy the
// file.
test_helper->DestroySimpleURLLoader();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
base::ScopedAllowBlockingForTesting allow_blocking;
EXPECT_FALSE(base::PathExists(dest_path));
@@ -2979,15 +2976,14 @@
}
// Don't inherit from SimpleURLLoaderTestBase so that we can initialize our
-// |scoped_task_environment_| different namely with TimeSource::MOCK_TIME.
+// |task_environment_| different namely with TimeSource::MOCK_TIME.
class SimpleURLLoaderMockTimeTest : public testing::Test {
public:
SimpleURLLoaderMockTimeTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME),
disallow_blocking_(std::make_unique<base::ScopedDisallowBlocking>()) {
SimpleURLLoader::SetTimeoutTickClockForTest(
- scoped_task_environment_.GetMockTickClock());
+ task_environment_.GetMockTickClock());
}
~SimpleURLLoaderMockTimeTest() override {}
@@ -3003,14 +2999,14 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::ScopedDisallowBlocking> disallow_blocking_;
};
// The amount of time that's simulated passing is equal to the timeout value
// specified, so the request should fail.
TEST_F(SimpleURLLoaderMockTimeTest, TimeoutTriggered) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kAdvanceOneSecond, TestLoaderEvent::kReceivedResponse,
TestLoaderEvent::kBodyBufferReceived, TestLoaderEvent::kResponseComplete,
@@ -3027,7 +3023,7 @@
// Less time is simulated passing than the timeout value, so this request should
// succeed normally.
TEST_F(SimpleURLLoaderMockTimeTest, TimeoutNotTriggered) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kAdvanceOneSecond, TestLoaderEvent::kReceivedResponse,
TestLoaderEvent::kBodyBufferReceived, TestLoaderEvent::kResponseComplete,
@@ -3045,7 +3041,7 @@
// Simulate time passing, without setting the timeout. This should result in no
// timer being started, and request should succeed.
TEST_F(SimpleURLLoaderMockTimeTest, TimeNotSetAndTimeAdvanced) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kAdvanceOneSecond, TestLoaderEvent::kReceivedResponse,
TestLoaderEvent::kBodyBufferReceived, TestLoaderEvent::kResponseComplete,
@@ -3061,7 +3057,7 @@
// Simulate time passing before and after a redirect. The redirect should not
// reset the timeout timer, and the request should timeout.
TEST_F(SimpleURLLoaderMockTimeTest, TimeoutAfterRedirectTriggered) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents(
{TestLoaderEvent::kAdvanceOneSecond, TestLoaderEvent::kReceivedRedirect,
TestLoaderEvent::kAdvanceOneSecond, TestLoaderEvent::kReceivedResponse,
@@ -3079,7 +3075,7 @@
// Simulate time passing after a failure. The retry restarts the timeout timer,
// so the second attempt gets a full two seconds and it is not exhausted.
TEST_F(SimpleURLLoaderMockTimeTest, TimeoutAfterRetryNotTriggered) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kAdvanceOneSecond,
TestLoaderEvent::kReceived501Response});
loader_factory.AddEvents(
@@ -3101,7 +3097,7 @@
// Trigger a failure and retry, and then simulate enough time passing to trigger
// the timeout. The retry should have correctly started its timeout timer.
TEST_F(SimpleURLLoaderMockTimeTest, TimeoutAfterRetryTriggered) {
- MockURLLoaderFactory loader_factory(&scoped_task_environment_);
+ MockURLLoaderFactory loader_factory(&task_environment_);
loader_factory.AddEvents({TestLoaderEvent::kAdvanceOneSecond,
TestLoaderEvent::kReceived501Response});
loader_factory.AddEvents(
@@ -3207,7 +3203,7 @@
base::RunLoop run_loop;
auto callback = base::BindLambdaForTesting([&](uint64_t current) {
test_helper->DestroySimpleURLLoader(); // cleanup files.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_helper.reset();
run_loop.Quit();
});
@@ -3232,7 +3228,7 @@
auto callback = base::BindLambdaForTesting([&](uint64_t current) {
if (current == kResponseSize) {
test_helper->DestroySimpleURLLoader(); // cleanup files.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
test_helper.reset();
run_loop.Quit();
}
diff --git a/services/network/resource_scheduler/resource_scheduler_unittest.cc b/services/network/resource_scheduler/resource_scheduler_unittest.cc
index ca4ee5f..2f6a865 100644
--- a/services/network/resource_scheduler/resource_scheduler_unittest.cc
+++ b/services/network/resource_scheduler/resource_scheduler_unittest.cc
@@ -495,7 +495,7 @@
ResourceScheduler* scheduler() { return scheduler_.get(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<ResourceScheduler> scheduler_;
net::TestNetworkQualityEstimator network_quality_estimator_;
net::TestURLRequestContext context_;
diff --git a/services/network/restricted_cookie_manager_unittest.cc b/services/network/restricted_cookie_manager_unittest.cc
index a545827..105b05c 100644
--- a/services/network/restricted_cookie_manager_unittest.cc
+++ b/services/network/restricted_cookie_manager_unittest.cc
@@ -252,8 +252,8 @@
return recording_client_.recorded_activity();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
net::CookieMonster cookie_monster_;
CookieSettings cookie_settings_;
RecordingNetworkContextClient recording_client_;
diff --git a/services/network/sec_header_helpers_unittest.cc b/services/network/sec_header_helpers_unittest.cc
index 6dd79a9f..7273616 100644
--- a/services/network/sec_header_helpers_unittest.cc
+++ b/services/network/sec_header_helpers_unittest.cc
@@ -32,8 +32,7 @@
class SecHeaderHelpersTest : public PlatformTest {
public:
SecHeaderHelpersTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
url_request_(context_.CreateRequest(GURL(kSecureSite),
net::DEFAULT_PRIORITY,
/*request_delegate=*/nullptr,
@@ -42,7 +41,7 @@
net::URLRequest* url_request() const { return url_request_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::TestURLRequestContext context_;
std::unique_ptr<net::URLRequest> url_request_;
};
diff --git a/services/network/session_cleanup_cookie_store_unittest.cc b/services/network/session_cleanup_cookie_store_unittest.cc
index 2da99e3..0aa5198e 100644
--- a/services/network/session_cleanup_cookie_store_unittest.cc
+++ b/services/network/session_cleanup_cookie_store_unittest.cc
@@ -83,7 +83,7 @@
void TearDown() override { DestroyStore(); }
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const scoped_refptr<base::SequencedTaskRunner> background_task_runner_ =
base::CreateSequencedTaskRunner({base::ThreadPool(), base::MayBlock()});
base::ScopedTempDir temp_dir_;
@@ -213,7 +213,7 @@
base::BindRepeating([](const std::string& domain, bool is_https) {
return domain == "nonpersistent.com";
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DestroyStore();
cookies = CreateAndLoad();
@@ -251,7 +251,7 @@
base::BindRepeating([](const std::string& domain, bool is_https) {
return domain == "nonpersistent.com";
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DestroyStore();
cookies = CreateAndLoad();
diff --git a/services/network/socket_data_pump_unittest.cc b/services/network/socket_data_pump_unittest.cc
index 2112fab8..26d8ee93 100644
--- a/services/network/socket_data_pump_unittest.cc
+++ b/services/network/socket_data_pump_unittest.cc
@@ -78,8 +78,7 @@
public ::testing::WithParamInterface<net::IoMode> {
public:
SocketDataPumpTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~SocketDataPumpTest() override {}
// Initializes the test case with a socket data provider, which will be used
@@ -130,7 +129,7 @@
mojo::ScopedDataPipeProducerHandle send_handle_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::MockClientSocketFactory mock_client_socket_factory_;
TestSocketDataPumpDelegate test_delegate_;
std::unique_ptr<net::StreamSocket> socket_;
diff --git a/services/network/ssl_config_service_mojo_unittest.cc b/services/network/ssl_config_service_mojo_unittest.cc
index c1ca72ce..d659d28 100644
--- a/services/network/ssl_config_service_mojo_unittest.cc
+++ b/services/network/ssl_config_service_mojo_unittest.cc
@@ -146,8 +146,7 @@
class NetworkServiceSSLConfigServiceTest : public testing::Test {
public:
NetworkServiceSSLConfigServiceTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
network_service_(NetworkService::CreateForTesting()) {}
~NetworkServiceSSLConfigServiceTest() override {
NetworkContext::SetCertVerifierForTesting(nullptr);
@@ -260,7 +259,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<NetworkService> network_service_;
mojom::SSLConfigClientPtr ssl_config_client_;
mojom::NetworkContextPtr network_context_ptr_;
diff --git a/services/network/tcp_bound_socket_unittest.cc b/services/network/tcp_bound_socket_unittest.cc
index 143de24b..b3477cc 100644
--- a/services/network/tcp_bound_socket_unittest.cc
+++ b/services/network/tcp_bound_socket_unittest.cc
@@ -38,8 +38,7 @@
class TCPBoundSocketTest : public testing::Test {
public:
TCPBoundSocketTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
factory_(nullptr /* net_log */, &url_request_context_) {}
~TCPBoundSocketTest() override {}
@@ -170,7 +169,7 @@
MojoResult result = receive_handle.BeginReadData(
&buffer, &num_bytes, MOJO_READ_DATA_FLAG_NONE);
if (result == MOJO_RESULT_SHOULD_WAIT) {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
continue;
}
if (result != MOJO_RESULT_OK) {
@@ -189,12 +188,10 @@
return net::IPEndPoint(net::IPAddress::IPv4Localhost(), 0 /* port */);
}
- base::test::ScopedTaskEnvironment* scoped_task_environment() {
- return &scoped_task_environment_;
- }
+ base::test::TaskEnvironment* task_environment() { return &task_environment_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::TestURLRequestContext url_request_context_;
SocketFactory factory_;
@@ -354,7 +351,7 @@
MojoResult result = client_socket_send_handle->BeginWriteData(
&buffer, &buffer_num_bytes, MOJO_WRITE_DATA_FLAG_NONE);
if (result == MOJO_RESULT_SHOULD_WAIT) {
- scoped_task_environment()->RunUntilIdle();
+ task_environment()->RunUntilIdle();
continue;
}
if (result != MOJO_RESULT_OK)
diff --git a/services/network/tcp_socket_unittest.cc b/services/network/tcp_socket_unittest.cc
index 4fd78ff..4cdd188 100644
--- a/services/network/tcp_socket_unittest.cc
+++ b/services/network/tcp_socket_unittest.cc
@@ -256,8 +256,7 @@
class TCPSocketTest : public testing::Test {
public:
TCPSocketTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
url_request_context_(true) {}
~TCPSocketTest() override {}
@@ -343,7 +342,7 @@
SocketFactory* factory() { return factory_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::TestURLRequestContext url_request_context_;
std::unique_ptr<SocketFactory> factory_;
TestSocketObserver test_observer_;
@@ -1428,8 +1427,8 @@
// net::ServerSocket::GetLocalAddress() fails. This should still be considered
// as a failure.
TEST(TCPServerSocketTest, GetLocalAddressFailedInListen) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
TCPServerSocket socket(nullptr /* delegate */, nullptr /* net_log */,
TRAFFIC_ANNOTATION_FOR_TESTS);
diff --git a/services/network/test/test_url_loader_factory_unittest.cc b/services/network/test/test_url_loader_factory_unittest.cc
index 893f54d9..eb0726a 100644
--- a/services/network/test/test_url_loader_factory_unittest.cc
+++ b/services/network/test/test_url_loader_factory_unittest.cc
@@ -51,7 +51,7 @@
TestURLLoaderClient* client() { return &client_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestURLLoaderFactory factory_;
mojom::URLLoaderPtr loader_;
TestURLLoaderClient client_;
diff --git a/services/network/throttling/throttling_controller_unittest.cc b/services/network/throttling/throttling_controller_unittest.cc
index 367a9ea..2c9134fc 100644
--- a/services/network/throttling/throttling_controller_unittest.cc
+++ b/services/network/throttling/throttling_controller_unittest.cc
@@ -143,12 +143,12 @@
ThrottlingNetworkTransaction* transaction() { return transaction_.get(); }
void FastForwardUntilNoTasksRemain() {
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
MockNetworkLayer network_layer_;
TestCallback callback_;
net::CompletionRepeatingCallback completion_callback_;
diff --git a/services/network/tls_client_socket_unittest.cc b/services/network/tls_client_socket_unittest.cc
index fbc6b18..95f1d78 100644
--- a/services/network/tls_client_socket_unittest.cc
+++ b/services/network/tls_client_socket_unittest.cc
@@ -49,8 +49,7 @@
explicit TLSClientSocketTestBase(Mode mode)
: mode_(mode),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
url_request_context_(true) {}
virtual ~TLSClientSocketTestBase() {}
@@ -279,7 +278,7 @@
private:
Mode mode_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Mojo data handles obtained from CreateTCPConnectedSocket.
mojo::ScopedDataPipeConsumerHandle pre_tls_recv_handle_;
diff --git a/services/network/transitional_url_loader_factory_owner_unittest.cc b/services/network/transitional_url_loader_factory_owner_unittest.cc
index 1930491..a86817a 100644
--- a/services/network/transitional_url_loader_factory_owner_unittest.cc
+++ b/services/network/transitional_url_loader_factory_owner_unittest.cc
@@ -27,8 +27,7 @@
class TransitionalURLLoaderFactoryOwnerTest : public ::testing::Test {
public:
TransitionalURLLoaderFactoryOwnerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
void SetUp() override {
net::test_server::RegisterDefaultHandlers(&test_server_);
@@ -68,7 +67,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::EmbeddedTestServer test_server_;
};
@@ -84,9 +83,9 @@
}
TEST_F(TransitionalURLLoaderFactoryOwnerTest, SameThread) {
- TestOnTaskRunner(scoped_task_environment_.GetMainThreadTaskRunner(),
- base::BindLambdaForTesting(
- [&]() { scoped_task_environment_.RunUntilIdle(); }));
+ TestOnTaskRunner(
+ task_environment_.GetMainThreadTaskRunner(),
+ base::BindLambdaForTesting([&]() { task_environment_.RunUntilIdle(); }));
}
} // namespace
diff --git a/services/network/udp_socket_unittest.cc b/services/network/udp_socket_unittest.cc
index f07e22b..21ae7b8 100644
--- a/services/network/udp_socket_unittest.cc
+++ b/services/network/udp_socket_unittest.cc
@@ -189,8 +189,7 @@
class UDPSocketTest : public testing::Test {
public:
UDPSocketTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
factory_(nullptr /*netlog*/, &url_request_context_) {}
~UDPSocketTest() override {}
@@ -207,7 +206,7 @@
SocketFactory* factory() { return &factory_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::TestURLRequestContext url_request_context_;
SocketFactory factory_;
diff --git a/services/network/url_loader_unittest.cc b/services/network/url_loader_unittest.cc
index fc02494a..19ff275 100644
--- a/services/network/url_loader_unittest.cc
+++ b/services/network/url_loader_unittest.cc
@@ -384,8 +384,7 @@
class URLLoaderTest : public testing::Test {
public:
URLLoaderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
resource_scheduler_(true) {
net::TestRootCerts* root_certs = net::TestRootCerts::GetInstance();
root_certs->AddFromFile(
@@ -727,7 +726,7 @@
return unowned_test_network_delegate_;
}
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
static constexpr int kProcessId = 4;
static constexpr int kRouteId = 8;
@@ -737,7 +736,7 @@
sent_request_ = request;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
net::EmbeddedTestServer test_server_;
std::unique_ptr<net::ScopedDefaultHostResolverProc> mock_host_resolver_;
net::TestNetworkDelegate*
diff --git a/services/network/websocket_throttler_unittest.cc b/services/network/websocket_throttler_unittest.cc
index 5fdb003..79b3dcc 100644
--- a/services/network/websocket_throttler_unittest.cc
+++ b/services/network/websocket_throttler_unittest.cc
@@ -16,7 +16,7 @@
class WebSocketThrottlerTest : public ::testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST(WebSocketPerProcessThrottlerTest, InitialState) {
diff --git a/services/preferences/persistent_pref_store_impl_unittest.cc b/services/preferences/persistent_pref_store_impl_unittest.cc
index 208bbae..4329649 100644
--- a/services/preferences/persistent_pref_store_impl_unittest.cc
+++ b/services/preferences/persistent_pref_store_impl_unittest.cc
@@ -73,7 +73,7 @@
PersistentPrefStore* pref_store() { return pref_store_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PersistentPrefStoreImpl> impl_;
diff --git a/services/preferences/pref_service_factory_unittest.cc b/services/preferences/pref_service_factory_unittest.cc
index d3fd6ea..ab96f01b 100644
--- a/services/preferences/pref_service_factory_unittest.cc
+++ b/services/preferences/pref_service_factory_unittest.cc
@@ -247,7 +247,7 @@
quit_closure.Run();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestServiceManager test_service_manager_;
base::ScopedTempDir profile_dir_;
scoped_refptr<WriteablePrefStore> above_user_prefs_pref_store_;
diff --git a/services/preferences/pref_store_consistency_unittest.cc b/services/preferences/pref_store_consistency_unittest.cc
index 85d7ca58..289c602 100644
--- a/services/preferences/pref_store_consistency_unittest.cc
+++ b/services/preferences/pref_store_consistency_unittest.cc
@@ -202,7 +202,7 @@
private:
scoped_refptr<PersistentPrefStore> pref_store_;
std::unique_ptr<PersistentPrefStoreImpl> pref_store_impl_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PersistentPrefStoreConsistencyTest, TwoPrefs) {
diff --git a/services/preferences/pref_store_impl_unittest.cc b/services/preferences/pref_store_impl_unittest.cc
index 486cb2c..b8f863a 100644
--- a/services/preferences/pref_store_impl_unittest.cc
+++ b/services/preferences/pref_store_impl_unittest.cc
@@ -102,7 +102,7 @@
PrefStore* pref_store() { return pref_store_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefStoreImpl> impl_;
diff --git a/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc b/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
index c28532e..2c3e0495 100644
--- a/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
+++ b/services/preferences/public/cpp/tests/persistent_pref_store_client_unittest.cc
@@ -102,7 +102,7 @@
void ClearMutableValues() override {}
void OnStoreDeletionFromDisk() override {}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PrefService> pref_service_;
diff --git a/services/preferences/public/cpp/tests/pref_store_client_unittest.cc b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
index dbb2f66..db0e8a10 100644
--- a/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
+++ b/services/preferences/public/cpp/tests/pref_store_client_unittest.cc
@@ -66,7 +66,7 @@
scoped_refptr<PrefStoreClient> store_;
// Required by mojo binding code within PrefStoreClient.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(PrefStoreClientTest);
};
diff --git a/services/preferences/tracked/pref_hash_filter_unittest.cc b/services/preferences/tracked/pref_hash_filter_unittest.cc
index 969e581f..923ed698 100644
--- a/services/preferences/tracked/pref_hash_filter_unittest.cc
+++ b/services/preferences/tracked/pref_hash_filter_unittest.cc
@@ -634,7 +634,7 @@
reset_recorded_ = true;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockValidationDelegate mock_validation_delegate_;
mojo::BindingSet<prefs::mojom::ResetOnLoadObserver>
reset_on_load_observer_bindings_;
diff --git a/services/preferences/tracked/segregated_pref_store_unittest.cc b/services/preferences/tracked/segregated_pref_store_unittest.cc
index c69b798..f037031 100644
--- a/services/preferences/tracked/segregated_pref_store_unittest.cc
+++ b/services/preferences/tracked/segregated_pref_store_unittest.cc
@@ -98,7 +98,7 @@
return std::move(read_error_delegate_);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
PrefStoreObserverMock observer_;
diff --git a/services/proxy_resolver/host_resolver_mojo_unittest.cc b/services/proxy_resolver/host_resolver_mojo_unittest.cc
index 3f8becd..1027d15 100644
--- a/services/proxy_resolver/host_resolver_mojo_unittest.cc
+++ b/services/proxy_resolver/host_resolver_mojo_unittest.cc
@@ -162,7 +162,7 @@
return result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
Waiter waiter_;
MockMojoHostResolver mock_resolver_;
HostResolverMojo resolver_;
diff --git a/services/proxy_resolver/proxy_resolver_factory_impl_unittest.cc b/services/proxy_resolver/proxy_resolver_factory_impl_unittest.cc
index b886ff7b..20b63ec 100644
--- a/services/proxy_resolver/proxy_resolver_factory_impl_unittest.cc
+++ b/services/proxy_resolver/proxy_resolver_factory_impl_unittest.cc
@@ -157,7 +157,7 @@
std::move(idle_callback_).Run();
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestProxyResolverFactoryImpl> mock_factory_impl_;
TestProxyResolverFactory* mock_factory_;
mojo::Remote<mojom::ProxyResolverFactory> factory_;
diff --git a/services/proxy_resolver/proxy_resolver_impl_unittest.cc b/services/proxy_resolver/proxy_resolver_impl_unittest.cc
index de7bc5b..b842e1b 100644
--- a/services/proxy_resolver/proxy_resolver_impl_unittest.cc
+++ b/services/proxy_resolver/proxy_resolver_impl_unittest.cc
@@ -211,7 +211,7 @@
~ProxyResolverImplTest() override = default;
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockProxyResolverV8Tracing* mock_proxy_resolver_;
std::unique_ptr<ProxyResolverImpl> resolver_impl_;
diff --git a/services/resource_coordinator/memory_instrumentation/coordinator_impl_unittest.cc b/services/resource_coordinator/memory_instrumentation/coordinator_impl_unittest.cc
index 230a254..a3705628 100644
--- a/services/resource_coordinator/memory_instrumentation/coordinator_impl_unittest.cc
+++ b/services/resource_coordinator/memory_instrumentation/coordinator_impl_unittest.cc
@@ -150,9 +150,9 @@
protected:
std::unique_ptr<NiceMock<FakeCoordinatorImpl>> coordinator_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY,
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::ThreadingMode::MAIN_THREAD_ONLY,
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
};
class MockClientProcess : public mojom::ClientProcess {
@@ -321,8 +321,8 @@
// This variable to be static as the lambda below has to convert to a function
// pointer rather than a functor.
- static base::test::ScopedTaskEnvironment* task_environment = nullptr;
- task_environment = &scoped_task_environment_;
+ static base::test::TaskEnvironment* task_environment = nullptr;
+ task_environment = &task_environment_;
NiceMock<MockClientProcess> client_process_1(this, 1,
mojom::ProcessType::BROWSER);
diff --git a/services/service_manager/public/cpp/test/test_connector_factory.h b/services/service_manager/public/cpp/test/test_connector_factory.h
index e8f55163..5a148d6 100644
--- a/services/service_manager/public/cpp/test/test_connector_factory.h
+++ b/services/service_manager/public/cpp/test/test_connector_factory.h
@@ -26,7 +26,7 @@
// Service Manager machinery. Typical usage should look something like:
//
// TEST(MyTest, Foo) {
-// base::test::ScopedTaskEnvironment task_environment;
+// base::test::TaskEnvironment task_environment;
// TestConnectorFactory connector_factory;
// my_service::MyServiceImpl service(connector_factory.RegisterInstance(
// my_service::mojom::kServiceName));
diff --git a/services/service_manager/public/cpp/test/test_service.h b/services/service_manager/public/cpp/test/test_service.h
index c66db89a..95fd4603 100644
--- a/services/service_manager/public/cpp/test/test_service.h
+++ b/services/service_manager/public/cpp/test/test_service.h
@@ -31,7 +31,7 @@
// }
//
// private:
-// base::test::ScopedTaskEnvironment task_environment_;
+// base::test::TaskEnvironment task_environment_;
// service_manager::TestServiceManager test_service_manager_;
// service_manager::TestService test_service_;
// };
diff --git a/services/service_manager/public/cpp/test/test_service_manager.h b/services/service_manager/public/cpp/test/test_service_manager.h
index 519f7b9..c3023cd 100644
--- a/services/service_manager/public/cpp/test/test_service_manager.h
+++ b/services/service_manager/public/cpp/test/test_service_manager.h
@@ -22,7 +22,7 @@
// a |service_manager::ServiceManager| instance directly.
//
// NOTE: Using this object in tests requires a task execution environment, for
-// example a live |base::test::ScopedTaskEnvironment| object.
+// example a live |base::test::TaskEnvironment| object.
class TestServiceManager {
public:
// Creates a TestServiceManager using the default global list of manifests.
diff --git a/services/service_manager/tests/background_service_manager_unittest.cc b/services/service_manager/tests/background_service_manager_unittest.cc
index 144c87f..8088c41 100644
--- a/services/service_manager/tests/background_service_manager_unittest.cc
+++ b/services/service_manager/tests/background_service_manager_unittest.cc
@@ -81,7 +81,7 @@
#define MAYBE_Basic Basic
#endif
TEST(BackgroundServiceManagerTest, MAYBE_Basic) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
BackgroundServiceManager background_service_manager(GetTestManifests());
mojom::ServicePtr service;
ServiceImpl service_impl(mojo::MakeRequest(&service));
diff --git a/services/service_manager/tests/connect/connect_unittest.cc b/services/service_manager/tests/connect/connect_unittest.cc
index 29576aa..fc3608d 100644
--- a/services/service_manager/tests/connect/connect_unittest.cc
+++ b/services/service_manager/tests/connect/connect_unittest.cc
@@ -339,7 +339,7 @@
connection_state_ = std::move(state);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestServiceManager test_service_manager_;
ServiceBinding service_binding_{this};
mojo::BindingSet<test::mojom::ExposedInterface> bindings_;
diff --git a/services/service_manager/tests/lifecycle/lifecycle_unittest.cc b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
index e68e301e..c8419c2e 100644
--- a/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
+++ b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
@@ -255,7 +255,7 @@
return base::WrapUnique(state);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestServiceManager test_service_manager_;
Service test_service_;
ServiceBinding test_service_binding_;
diff --git a/services/service_manager/tests/service_manager/service_manager_listener_unittest.cc b/services/service_manager/tests/service_manager/service_manager_listener_unittest.cc
index 73059a26..a383758 100644
--- a/services/service_manager/tests/service_manager/service_manager_listener_unittest.cc
+++ b/services/service_manager/tests/service_manager/service_manager_listener_unittest.cc
@@ -142,7 +142,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
ServiceManager service_manager_;
ServiceBinding service_binding_{this};
std::unique_ptr<TestListener> listener_;
diff --git a/services/service_manager/tests/service_manager/service_manager_unittest.cc b/services/service_manager/tests/service_manager/service_manager_unittest.cc
index 3279e1c..a29b2d9 100644
--- a/services/service_manager/tests/service_manager/service_manager_unittest.cc
+++ b/services/service_manager/tests/service_manager/service_manager_unittest.cc
@@ -380,7 +380,7 @@
service_pid_received_callback_.Run(identity, pid);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestServiceManager test_service_manager_;
TestService test_service_;
diff --git a/services/service_manager/tests/service_process_launcher_unittest.cc b/services/service_manager/tests/service_process_launcher_unittest.cc
index 4b0f080..e2d84e3 100644
--- a/services/service_manager/tests/service_process_launcher_unittest.cc
+++ b/services/service_manager/tests/service_process_launcher_unittest.cc
@@ -72,7 +72,7 @@
#define MAYBE_StartJoin StartJoin
#endif // defined(OS_ANDROID)
TEST(ServiceProcessLauncherTest, MAYBE_StartJoin) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::FilePath test_service_path;
#if defined(OS_FUCHSIA)
@@ -95,7 +95,7 @@
run_loop.Run();
launcher.reset();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
EXPECT_EQ(1u, service_process_launcher_delegate.get_and_clear_adjust_count());
}
@@ -108,7 +108,7 @@
// launch child processes, since we won't fail until exec(), therefore the test
// will see a valid child process-Id. We use posix_spawn() on Mac OS X.
TEST(ServiceProcessLauncherTest, FailToLaunchProcess) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
// Pick a service path that could not possibly ever exist.
base::FilePath test_service_path(FILE_PATH_LITERAL("rockot@_rules.service"));
@@ -124,7 +124,7 @@
run_loop.Run();
launcher.reset();
- scoped_task_environment.RunUntilIdle();
+ task_environment.RunUntilIdle();
}
#endif // !defined(OS_POSIX) || defined(OS_MACOSX)
diff --git a/services/service_manager/tests/shutdown/shutdown_unittest.cc b/services/service_manager/tests/shutdown/shutdown_unittest.cc
index 5dbb269f..e8078fd 100644
--- a/services/service_manager/tests/shutdown/shutdown_unittest.cc
+++ b/services/service_manager/tests/shutdown/shutdown_unittest.cc
@@ -78,7 +78,7 @@
Connector* connector() { return test_service_binding_.GetConnector(); }
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestServiceManager test_service_manager_;
Service test_service_;
ServiceBinding test_service_binding_;
diff --git a/services/service_manager/tests/test_support_unittest.cc b/services/service_manager/tests/test_support_unittest.cc
index 0650d13..a2c5c2c 100644
--- a/services/service_manager/tests/test_support_unittest.cc
+++ b/services/service_manager/tests/test_support_unittest.cc
@@ -109,7 +109,7 @@
} // namespace
TEST(ServiceManagerTestSupport, TestConnectorFactoryUniqueService) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestConnectorFactory factory;
TestCServiceImpl c_service(factory.RegisterInstance(kServiceCName));
@@ -123,7 +123,7 @@
}
TEST(ServiceManagerTestSupport, TestConnectorFactoryMultipleServices) {
- base::test::ScopedTaskEnvironment task_environment;
+ base::test::TaskEnvironment task_environment;
TestConnectorFactory factory;
TestBServiceImpl b_service(factory.RegisterInstance(kServiceBName));
diff --git a/services/shape_detection/barcode_detection_impl_mac_unittest.mm b/services/shape_detection/barcode_detection_impl_mac_unittest.mm
index 8ad606a..d83b16b3 100644
--- a/services/shape_detection/barcode_detection_impl_mac_unittest.mm
+++ b/services/shape_detection/barcode_detection_impl_mac_unittest.mm
@@ -120,7 +120,7 @@
MOCK_METHOD0(Detection, void(void));
std::unique_ptr<mojom::BarcodeDetection> impl_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
void* vision_framework_ = nullptr;
};
diff --git a/services/shape_detection/barcode_detection_provider_mac_unittest.mm b/services/shape_detection/barcode_detection_provider_mac_unittest.mm
index 5dc92d3..a5538772 100644
--- a/services/shape_detection/barcode_detection_provider_mac_unittest.mm
+++ b/services/shape_detection/barcode_detection_provider_mac_unittest.mm
@@ -124,7 +124,7 @@
MOCK_METHOD0(OnEnumerateSupportedFormats, void(void));
std::unique_ptr<mojom::BarcodeDetectionProvider> provider_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
void* vision_framework_ = nullptr;
bool is_vision_available_ = false;
};
diff --git a/services/shape_detection/face_detection_impl_mac_unittest.mm b/services/shape_detection/face_detection_impl_mac_unittest.mm
index 19c4d62..3fd4771 100644
--- a/services/shape_detection/face_detection_impl_mac_unittest.mm
+++ b/services/shape_detection/face_detection_impl_mac_unittest.mm
@@ -137,7 +137,7 @@
MOCK_METHOD0(Detection, void(void));
std::unique_ptr<mojom::FaceDetection> impl_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
void* vision_framework_;
};
diff --git a/services/shape_detection/face_detection_impl_win_unittest.cc b/services/shape_detection/face_detection_impl_win_unittest.cc
index 014b3b8..65b0565 100644
--- a/services/shape_detection/face_detection_impl_win_unittest.cc
+++ b/services/shape_detection/face_detection_impl_win_unittest.cc
@@ -83,7 +83,7 @@
private:
std::unique_ptr<base::win::ScopedCOMInitializer> scoped_com_initializer_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(FaceDetectionImplWinTest);
};
diff --git a/services/shape_detection/text_detection_impl_mac_unittest.mm b/services/shape_detection/text_detection_impl_mac_unittest.mm
index 411adbec..e709425 100644
--- a/services/shape_detection/text_detection_impl_mac_unittest.mm
+++ b/services/shape_detection/text_detection_impl_mac_unittest.mm
@@ -34,7 +34,7 @@
MOCK_METHOD1(Detection, void(size_t));
API_AVAILABLE(macosx(10.11)) std::unique_ptr<TextDetectionImplMac> impl_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(TextDetectionImplMacTest, CreateAndDestroy) {}
diff --git a/services/shape_detection/text_detection_impl_win_unittest.cc b/services/shape_detection/text_detection_impl_win_unittest.cc
index 82cdcb7..9a21fa1 100644
--- a/services/shape_detection/text_detection_impl_win_unittest.cc
+++ b/services/shape_detection/text_detection_impl_win_unittest.cc
@@ -48,7 +48,7 @@
private:
std::unique_ptr<base::win::ScopedCOMInitializer> scoped_com_initializer_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(TextDetectionImplWinTest);
};
diff --git a/services/tracing/coordinator_test_util.h b/services/tracing/coordinator_test_util.h
index 21c08625..07a40b5 100644
--- a/services/tracing/coordinator_test_util.h
+++ b/services/tracing/coordinator_test_util.h
@@ -57,7 +57,7 @@
std::unique_ptr<Coordinator> coordinator_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<AgentRegistry> agent_registry_;
std::vector<std::unique_ptr<MockAgent>> agents_;
diff --git a/services/tracing/perfetto/consumer_host_unittest.cc b/services/tracing/perfetto/consumer_host_unittest.cc
index a0c4fbf..22b3a6d 100644
--- a/services/tracing/perfetto/consumer_host_unittest.cc
+++ b/services/tracing/perfetto/consumer_host_unittest.cc
@@ -400,7 +400,7 @@
bool IsTracingEnabled() {
// Flush any other pending tasks on the perfetto task runner to ensure that
// any pending data source start callbacks have propagated.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
return threaded_service_->IsTracingEnabled();
}
@@ -413,7 +413,7 @@
private:
std::unique_ptr<ThreadedPerfettoService> threaded_service_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::OnceClosure on_data_complete_;
std::unique_ptr<mojo::DataPipeDrainer> drainer_;
std::vector<uint8_t> received_data_;
diff --git a/services/tracing/perfetto/perfetto_integration_unittest.cc b/services/tracing/perfetto/perfetto_integration_unittest.cc
index 1441d517..2eb5e03 100644
--- a/services/tracing/perfetto/perfetto_integration_unittest.cc
+++ b/services/tracing/perfetto/perfetto_integration_unittest.cc
@@ -48,12 +48,12 @@
void TearDown() override { perfetto_service_.reset(); }
PerfettoService* perfetto_service() const { return perfetto_service_.get(); }
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
protected:
std::unique_ptr<TestDataSource> data_source_;
std::unique_ptr<PerfettoService> perfetto_service_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(PerfettoIntegrationTest, ProducerDatasourceInitialized) {
diff --git a/services/tracing/perfetto/system_perfetto_unittest.cc b/services/tracing/perfetto/system_perfetto_unittest.cc
index 19443e8..1b43c71 100644
--- a/services/tracing/perfetto/system_perfetto_unittest.cc
+++ b/services/tracing/perfetto/system_perfetto_unittest.cc
@@ -52,8 +52,7 @@
class SystemPerfettoTest : public testing::Test {
public:
SystemPerfettoTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {
// Ensure system tracing is enabled for all tests.
base::test::ScopedFeatureList feature_list;
feature_list.InitAndEnableFeature(features::kEnablePerfettoSystemTracing);
@@ -136,7 +135,7 @@
~SystemPerfettoTest() override {
// The real "AndroidSystemProducer" must be destroyed on the correct
- // sequence however that sequence is tied to the |scoped_task_environment_|
+ // sequence however that sequence is tied to the |task_environment_|
// which is being deleted now. Therefore to prevent it crashing a future
// test we destroy it now.
PerfettoTracedProcess::GetTaskRunner()->GetOrCreateTaskRunner()->PostTask(
@@ -149,7 +148,7 @@
RunUntilIdle();
// The producer client will be destroyed in the next iteration of the test,
// but the sequence it was used on disappears with the
- // |scoped_task_environment_|. So we reset the sequence so it can be freely
+ // |task_environment_|. So we reset the sequence so it can be freely
// destroyed.
PerfettoTracedProcess::Get()->producer_client()->ResetSequenceForTesting();
if (old_tmp_dir_) {
@@ -162,7 +161,7 @@
}
PerfettoService* local_service() const { return perfetto_service_.get(); }
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
// Fork() + executes the perfetto cmdline client with the given args and
// returns true if we exited with a success otherwise |stderr_| is populated
@@ -215,7 +214,7 @@
std::string consumer_socket_;
std::unique_ptr<PerfettoService> perfetto_service_;
std::vector<std::unique_ptr<TestDataSource>> data_sources_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::string stderr_;
const char* old_tmp_dir_ = nullptr;
};
diff --git a/services/tracing/public/cpp/perfetto/task_runner_unittest.cc b/services/tracing/public/cpp/perfetto/task_runner_unittest.cc
index ce93b41..af7bc32 100644
--- a/services/tracing/public/cpp/perfetto/task_runner_unittest.cc
+++ b/services/tracing/public/cpp/perfetto/task_runner_unittest.cc
@@ -114,7 +114,7 @@
TaskDestination* destination() { return task_destination_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
std::unique_ptr<PerfettoTaskRunner> task_runner_;
std::unique_ptr<TaskDestination> task_destination_;
diff --git a/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc b/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc
index 7ab0d7e..322facd 100644
--- a/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc
+++ b/services/tracing/public/cpp/perfetto/trace_event_data_source_unittest.cc
@@ -217,7 +217,7 @@
PerfettoTracedProcess::ResetTaskRunnerForTesting();
PerfettoTracedProcess::GetTaskRunner()->GetOrCreateTaskRunner();
auto perfetto_wrapper = std::make_unique<PerfettoTaskRunner>(
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
producer_client_ =
std::make_unique<MockProducerClient>(std::move(perfetto_wrapper));
base::ThreadIdNameManager::GetInstance()->SetName(kTestThread);
@@ -436,7 +436,7 @@
protected:
// Should be the first member.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockProducerClient> producer_client_;
int64_t last_timestamp_ = 0;
diff --git a/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc b/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc
index 7222fab..bf919a1 100644
--- a/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc
+++ b/services/tracing/public/cpp/stack_sampling/stack_unwinder_android_unittest.cc
@@ -34,7 +34,7 @@
private:
StackUnwinderAndroid unwinder_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(StackUnwinderTest);
};
diff --git a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler_unittest.cc b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler_unittest.cc
index 3239d06..f38b849 100644
--- a/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler_unittest.cc
+++ b/services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler_unittest.cc
@@ -146,7 +146,7 @@
PerfettoTracedProcess::GetTaskRunner()->GetOrCreateTaskRunner();
auto perfetto_wrapper = std::make_unique<PerfettoTaskRunner>(
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
producer_ =
std::make_unique<MockPerfettoProducer>(std::move(perfetto_wrapper));
@@ -154,7 +154,7 @@
void TearDown() override {
// Be sure there is no pending/running tasks.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void BeginTrace() {
@@ -213,7 +213,7 @@
const MockPerfettoProducer* producer() const { return producer_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// We want our singleton torn down after each test.
base::ShadowingAtExitManager at_exit_manager_;
diff --git a/services/tracing/public/cpp/trace_event_agent_unittest.cc b/services/tracing/public/cpp/trace_event_agent_unittest.cc
index 27ddafef..d1dce69 100644
--- a/services/tracing/public/cpp/trace_event_agent_unittest.cc
+++ b/services/tracing/public/cpp/trace_event_agent_unittest.cc
@@ -112,7 +112,7 @@
MockRecorder* recorder() const { return recorder_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockRecorder> recorder_;
};
diff --git a/services/tracing/tracing_service_unittest.cc b/services/tracing/tracing_service_unittest.cc
index fad0c44..6a1dfc8 100644
--- a/services/tracing/tracing_service_unittest.cc
+++ b/services/tracing/tracing_service_unittest.cc
@@ -34,7 +34,7 @@
}
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
service_manager::TestConnectorFactory test_connector_factory_;
TracingService service_;
diff --git a/services/video_capture/broadcasting_receiver_unittest.cc b/services/video_capture/broadcasting_receiver_unittest.cc
index b3e05ea5..82cda91 100644
--- a/services/video_capture/broadcasting_receiver_unittest.cc
+++ b/services/video_capture/broadcasting_receiver_unittest.cc
@@ -63,7 +63,7 @@
int32_t client_id_1_;
int32_t client_id_2_;
base::UnsafeSharedMemoryRegion shm_region_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(
diff --git a/services/video_capture/device_media_to_mojo_adapter_unittest.cc b/services/video_capture/device_media_to_mojo_adapter_unittest.cc
index 7ae494eb..a016b53 100644
--- a/services/video_capture/device_media_to_mojo_adapter_unittest.cc
+++ b/services/video_capture/device_media_to_mojo_adapter_unittest.cc
@@ -49,7 +49,7 @@
std::unique_ptr<DeviceMediaToMojoAdapter> adapter_;
std::unique_ptr<MockReceiver> mock_receiver_;
mojom::ReceiverPtr receiver_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(DeviceMediaToMojoAdapterTest,
diff --git a/services/video_capture/test/mock_device_shared_access_unittest.cc b/services/video_capture/test/mock_device_shared_access_unittest.cc
index 4a05a9c..4817e43 100644
--- a/services/video_capture/test/mock_device_shared_access_unittest.cc
+++ b/services/video_capture/test/mock_device_shared_access_unittest.cc
@@ -247,7 +247,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
media::MockDevice mock_device_;
media::MockDeviceFactory* mock_device_factory_;
std::unique_ptr<DeviceFactoryMediaToMojoAdapter> service_device_factory_;
diff --git a/services/video_capture/test/service_lifecycle_unittest.cc b/services/video_capture/test/service_lifecycle_unittest.cc
index 46c715e4..c4b6353 100644
--- a/services/video_capture/test/service_lifecycle_unittest.cc
+++ b/services/video_capture/test/service_lifecycle_unittest.cc
@@ -38,7 +38,7 @@
switches::kUseFakeDeviceForMediaStream);
service_impl_ = std::make_unique<VideoCaptureServiceImpl>(
service_remote_.BindNewPipeAndPassReceiver(),
- scoped_task_environment_.GetMainThreadTaskRunner());
+ task_environment_.GetMainThreadTaskRunner());
service_remote_.set_idle_handler(
base::TimeDelta(),
base::BindRepeating(&VideoCaptureServiceLifecycleTest::OnServiceIdle,
@@ -46,7 +46,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<VideoCaptureServiceImpl> service_impl_;
mojo::Remote<mojom::VideoCaptureService> service_remote_;
base::MockCallback<mojom::DeviceFactory::GetDeviceInfosCallback>
diff --git a/services/video_capture/test/video_capture_service_test.h b/services/video_capture/test/video_capture_service_test.h
index e641674..ea50588 100644
--- a/services/video_capture/test/video_capture_service_test.h
+++ b/services/video_capture/test/video_capture_service_test.h
@@ -42,7 +42,7 @@
mojom::TextureVirtualDevicePtr AddTextureVirtualDevice(
const std::string& device_id);
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<VideoCaptureServiceImpl> service_impl_;
mojo::Remote<mojom::VideoCaptureService> service_remote_;
diff --git a/services/video_capture/test/virtual_device_unittest.cc b/services/video_capture/test/virtual_device_unittest.cc
index 0b82327..fe122341 100644
--- a/services/video_capture/test/virtual_device_unittest.cc
+++ b/services/video_capture/test/virtual_device_unittest.cc
@@ -95,7 +95,7 @@
std::unique_ptr<MockProducer> producer_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
media::VideoCaptureDeviceInfo device_info_;
};
diff --git a/services/video_capture/texture_virtual_device_mojo_adapter_unittest.cc b/services/video_capture/texture_virtual_device_mojo_adapter_unittest.cc
index f0774b7..1f5be8b 100644
--- a/services/video_capture/texture_virtual_device_mojo_adapter_unittest.cc
+++ b/services/video_capture/texture_virtual_device_mojo_adapter_unittest.cc
@@ -60,7 +60,7 @@
std::unique_ptr<MockReceiver> mock_receiver_2_;
private:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TextureVirtualDeviceMojoAdapter> adapter_;
mojom::ReceiverPtr receiver_1_;
mojom::ReceiverPtr receiver_2_;
diff --git a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
index 1c2842d3..f9227b2 100644
--- a/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
+++ b/services/viz/public/cpp/compositing/mojom_traits_unittest.cc
@@ -221,7 +221,7 @@
}
TEST_F(StructTraitsTest, CopyOutputRequest_BitmapRequest) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const auto result_format = CopyOutputRequest::ResultFormat::RGBA_BITMAP;
const gfx::Rect area(5, 7, 44, 55);
@@ -277,7 +277,7 @@
}
TEST_F(StructTraitsTest, CopyOutputRequest_MessagePipeBroken) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::RunLoop run_loop;
auto request = std::make_unique<CopyOutputRequest>(
@@ -299,7 +299,7 @@
}
TEST_F(StructTraitsTest, CopyOutputRequest_TextureRequest) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const auto result_format = CopyOutputRequest::ResultFormat::RGBA_TEXTURE;
const int8_t mailbox_name[GL_MAILBOX_SIZE_CHROMIUM] = {
@@ -356,7 +356,7 @@
}
TEST_F(StructTraitsTest, CopyOutputRequest_CallbackRunsOnce) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
int n_called = 0;
auto request = std::make_unique<CopyOutputRequest>(
@@ -698,7 +698,7 @@
TEST_F(StructTraitsTest, RenderPass) {
// The CopyOutputRequest struct traits require a TaskRunner.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const RenderPassId render_pass_id = 3u;
const gfx::Rect output_rect(45, 22, 120, 13);
@@ -1179,7 +1179,7 @@
}
TEST_F(StructTraitsTest, CopyOutputResult_EmptyTexture) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
auto input = std::make_unique<CopyOutputResult>(
CopyOutputResult::Format::RGBA_TEXTURE, gfx::Rect());
@@ -1230,7 +1230,7 @@
}
TEST_F(StructTraitsTest, CopyOutputResult_Texture) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
const gfx::Rect result_rect(12, 34, 56, 78);
const gfx::ColorSpace result_color_space =
diff --git a/services/viz/public/cpp/gpu/gpu_unittest.cc b/services/viz/public/cpp/gpu/gpu_unittest.cc
index c3d32fd..621ece7a 100644
--- a/services/viz/public/cpp/gpu/gpu_unittest.cc
+++ b/services/viz/public/cpp/gpu/gpu_unittest.cc
@@ -157,7 +157,7 @@
event.Wait();
}
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
base::Thread io_thread_;
std::unique_ptr<Gpu> gpu_;
std::unique_ptr<TestGpuImpl> gpu_impl_;
diff --git a/skia/public/mojom/test/mojom_traits_unittest.cc b/skia/public/mojom/test/mojom_traits_unittest.cc
index e4087ed3..8c507dc9 100644
--- a/skia/public/mojom/test/mojom_traits_unittest.cc
+++ b/skia/public/mojom/test/mojom_traits_unittest.cc
@@ -46,7 +46,7 @@
std::move(callback).Run(t);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
diff --git a/storage/browser/blob/blob_builder_from_stream_unittest.cc b/storage/browser/blob/blob_builder_from_stream_unittest.cc
index 4f60ca2d..b75e4e0 100644
--- a/storage/browser/blob/blob_builder_from_stream_unittest.cc
+++ b/storage/browser/blob/blob_builder_from_stream_unittest.cc
@@ -176,7 +176,7 @@
const std::string kContentDisposition = "disposition";
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
BlobStorageLimits limits_;
std::unique_ptr<BlobStorageContext> context_;
};
diff --git a/storage/browser/blob/blob_flattener_unittest.cc b/storage/browser/blob/blob_flattener_unittest.cc
index 553eb2bc..d0561a0 100644
--- a/storage/browser/blob/blob_flattener_unittest.cc
+++ b/storage/browser/blob/blob_flattener_unittest.cc
@@ -117,7 +117,7 @@
base::ScopedTempDir temp_dir_;
scoped_refptr<TestSimpleTaskRunner> file_runner_ = new TestSimpleTaskRunner();
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<BlobStorageContext> context_;
};
diff --git a/storage/browser/blob/blob_impl_unittest.cc b/storage/browser/blob/blob_impl_unittest.cc
index 964bd677..86014a88c 100644
--- a/storage/browser/blob/blob_impl_unittest.cc
+++ b/storage/browser/blob/blob_impl_unittest.cc
@@ -103,7 +103,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<BlobStorageContext> context_;
};
diff --git a/storage/browser/blob/blob_memory_controller_unittest.cc b/storage/browser/blob/blob_memory_controller_unittest.cc
index d6aa1af..1bca8b9 100644
--- a/storage/browser/blob/blob_memory_controller_unittest.cc
+++ b/storage/browser/blob/blob_memory_controller_unittest.cc
@@ -165,7 +165,7 @@
scoped_refptr<TestSimpleTaskRunner> file_runner_ = new TestSimpleTaskRunner();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BlobMemoryControllerTest, Strategy) {
diff --git a/storage/browser/blob/blob_reader_unittest.cc b/storage/browser/blob/blob_reader_unittest.cc
index 5ce22762..c8030b0 100644
--- a/storage/browser/blob/blob_reader_unittest.cc
+++ b/storage/browser/blob/blob_reader_unittest.cc
@@ -270,7 +270,7 @@
return reader_->total_size_calculated();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
BlobStorageContext context_;
std::unique_ptr<BlobDataHandle> blob_handle_;
diff --git a/storage/browser/blob/blob_registry_impl_unittest.cc b/storage/browser/blob/blob_registry_impl_unittest.cc
index adcfad05..09fada9 100644
--- a/storage/browser/blob/blob_registry_impl_unittest.cc
+++ b/storage/browser/blob/blob_registry_impl_unittest.cc
@@ -177,7 +177,7 @@
protected:
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<BlobStorageContext> context_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
std::unique_ptr<BlobRegistryImpl> registry_impl_;
@@ -967,7 +967,7 @@
// Now cause construction to complete, if it would still be going on.
CreateBytesProvider(kData, std::move(request));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0u, BlobsUnderConstruction());
}
@@ -1003,7 +1003,7 @@
// Now cause construction to complete, if it would still be going on.
CreateBytesProvider(kData, std::move(request));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
base::RunLoop().RunUntilIdle();
EXPECT_EQ(0u, BlobsUnderConstruction());
}
diff --git a/storage/browser/blob/blob_storage_context_unittest.cc b/storage/browser/blob/blob_storage_context_unittest.cc
index 4e244926..5c20970 100644
--- a/storage/browser/blob/blob_storage_context_unittest.cc
+++ b/storage/browser/blob/blob_storage_context_unittest.cc
@@ -115,7 +115,7 @@
base::ScopedTempDir temp_dir_;
scoped_refptr<TestSimpleTaskRunner> file_runner_ = new TestSimpleTaskRunner();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<BlobStorageContext> context_;
};
diff --git a/storage/browser/blob/blob_transport_strategy_unittest.cc b/storage/browser/blob/blob_transport_strategy_unittest.cc
index ef2c9cb..83b2d004 100644
--- a/storage/browser/blob/blob_transport_strategy_unittest.cc
+++ b/storage/browser/blob/blob_transport_strategy_unittest.cc
@@ -96,7 +96,7 @@
protected:
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SequencedTaskRunner> bytes_provider_runner_;
base::Time mock_time_;
storage::BlobStorageLimits limits_;
diff --git a/storage/browser/blob/blob_url_store_impl_unittest.cc b/storage/browser/blob/blob_url_store_impl_unittest.cc
index ffafe3d..7246d7d8 100644
--- a/storage/browser/blob/blob_url_store_impl_unittest.cc
+++ b/storage/browser/blob/blob_url_store_impl_unittest.cc
@@ -101,7 +101,7 @@
const GURL kFragmentUrl = GURL("blob:id#fragment");
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<BlobStorageContext> context_;
MockBlobRegistryDelegate delegate_;
std::vector<std::string> bad_messages_;
diff --git a/storage/browser/database/database_quota_client_unittest.cc b/storage/browser/database/database_quota_client_unittest.cc
index d0635f3..6e07f4f 100644
--- a/storage/browser/database/database_quota_client_unittest.cc
+++ b/storage/browser/database/database_quota_client_unittest.cc
@@ -198,7 +198,7 @@
delete_status_ = status;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
int64_t usage_;
std::set<url::Origin> origins_;
blink::mojom::QuotaStatusCode delete_status_;
diff --git a/storage/browser/database/database_tracker_unittest.cc b/storage/browser/database/database_tracker_unittest.cc
index 2f578fbe..86eba1ae 100644
--- a/storage/browser/database/database_tracker_unittest.cc
+++ b/storage/browser/database/database_tracker_unittest.cc
@@ -189,7 +189,7 @@
public:
static void TestDeleteOpenDatabase(bool incognito_mode) {
// Initialize the tracker database.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
scoped_refptr<MockSpecialStoragePolicy> special_storage_policy =
@@ -285,7 +285,7 @@
static void TestDatabaseTracker(bool incognito_mode) {
// Initialize the tracker database.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
scoped_refptr<MockSpecialStoragePolicy> special_storage_policy =
@@ -426,7 +426,7 @@
const base::string16 kName = ASCIIToUTF16("name");
const base::string16 kDescription = ASCIIToUTF16("description");
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ -537,7 +537,7 @@
const base::string16 kDescription = ASCIIToUTF16("database_description");
// Initialize the tracker database.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath origin1_db_dir;
@@ -617,7 +617,7 @@
const base::string16 kDescription = ASCIIToUTF16("database_description");
// Initialize the tracker database.
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath origin1_db_dir;
@@ -693,7 +693,7 @@
// Initialize a tracker database, no need to put it on disk.
const bool kUseInMemoryTrackerDatabase = true;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
scoped_refptr<DatabaseTracker> tracker(
@@ -742,7 +742,7 @@
// Initialize a tracker database, no need to put it on disk.
const bool kUseInMemoryTrackerDatabase = true;
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
scoped_refptr<DatabaseTracker> tracker(
diff --git a/storage/browser/fileapi/copy_or_move_file_validator_unittest.cc b/storage/browser/fileapi/copy_or_move_file_validator_unittest.cc
index 89671a11..903c1a4 100644
--- a/storage/browser/fileapi/copy_or_move_file_validator_unittest.cc
+++ b/storage/browser/fileapi/copy_or_move_file_validator_unittest.cc
@@ -181,7 +181,7 @@
std::string src_fsid_;
std::string dest_fsid_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
FileSystemURL copy_src_;
diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/storage/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
index 1f151700..9835d4f 100644
--- a/storage/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/storage/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -182,15 +182,14 @@
: origin_(origin),
src_type_(src_type),
dest_type_(dest_type),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
~CopyOrMoveOperationTestHelper() {
file_system_context_ = nullptr;
quota_manager_proxy_->SimulateQuotaManagerDestroyed();
quota_manager_ = nullptr;
quota_manager_proxy_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void SetUp() {
@@ -239,7 +238,7 @@
base::FilePath()),
storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
base::BindOnce(&ExpectOk));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Grant relatively big quota initially.
quota_manager_->SetQuota(
@@ -402,7 +401,7 @@
const storage::FileSystemType src_type_;
const storage::FileSystemType dest_type_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
scoped_refptr<MockQuotaManager> quota_manager_;
@@ -737,8 +736,8 @@
base::WriteFile(source_path, kTestData,
base::size(kTestData) - 1); // Exclude trailing '\0'.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::Thread file_thread("file_thread");
ASSERT_TRUE(file_thread.Start());
ScopedThreadStopper thread_stopper(&file_thread);
@@ -795,8 +794,8 @@
base::WriteFile(source_path, kTestData,
base::size(kTestData) - 1); // Exclude trailing '\0'.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::Thread file_thread("file_thread");
ASSERT_TRUE(file_thread.Start());
ScopedThreadStopper thread_stopper(&file_thread);
@@ -849,8 +848,8 @@
base::WriteFile(source_path, kTestData,
base::size(kTestData) - 1); // Exclude trailing '\0'.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::IO);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::IO);
base::Thread file_thread("file_thread");
ASSERT_TRUE(file_thread.Start());
ScopedThreadStopper thread_stopper(&file_thread);
diff --git a/storage/browser/fileapi/dragged_file_util_unittest.cc b/storage/browser/fileapi/dragged_file_util_unittest.cc
index bb35747..bc57462 100644
--- a/storage/browser/fileapi/dragged_file_util_unittest.cc
+++ b/storage/browser/fileapi/dragged_file_util_unittest.cc
@@ -281,8 +281,8 @@
base::ScopedTempDir data_dir_;
base::ScopedTempDir partition_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
std::string filesystem_id_;
scoped_refptr<FileSystemContext> file_system_context_;
std::map<base::FilePath, base::FilePath> toplevel_root_map_;
diff --git a/storage/browser/fileapi/file_system_context_unittest.cc b/storage/browser/fileapi/file_system_context_unittest.cc
index b579dcd6..327ad85 100644
--- a/storage/browser/fileapi/file_system_context_unittest.cc
+++ b/storage/browser/fileapi/file_system_context_unittest.cc
@@ -96,7 +96,7 @@
private:
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
scoped_refptr<MockQuotaManager> mock_quota_manager_;
};
diff --git a/storage/browser/fileapi/file_system_file_stream_reader_unittest.cc b/storage/browser/fileapi/file_system_file_stream_reader_unittest.cc
index c3855bf..8d94f759 100644
--- a/storage/browser/fileapi/file_system_file_stream_reader_unittest.cc
+++ b/storage/browser/fileapi/file_system_file_stream_reader_unittest.cc
@@ -116,8 +116,8 @@
base::FilePath().AppendASCII(file_name));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
base::ScopedTempDir temp_dir_;
scoped_refptr<FileSystemContext> file_system_context_;
base::Time test_file_modification_time_;
diff --git a/storage/browser/fileapi/file_system_operation_impl_unittest.cc b/storage/browser/fileapi/file_system_operation_impl_unittest.cc
index d87f7f34..3c1b645 100644
--- a/storage/browser/fileapi/file_system_operation_impl_unittest.cc
+++ b/storage/browser/fileapi/file_system_operation_impl_unittest.cc
@@ -58,8 +58,7 @@
: public testing::Test {
public:
FileSystemOperationImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
protected:
void SetUp() override {
@@ -254,7 +253,7 @@
quota_manager_.get(),
url::Origin::Create(sandbox_file_system_.origin()),
sandbox_file_system_.type(), usage, quota);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_EQ(blink::mojom::QuotaStatusCode::kOk, status);
}
@@ -460,7 +459,7 @@
return status;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
scoped_refptr<QuotaManager> quota_manager_;
diff --git a/storage/browser/fileapi/file_system_operation_impl_write_unittest.cc b/storage/browser/fileapi/file_system_operation_impl_write_unittest.cc
index 727d262..39303a6 100644
--- a/storage/browser/fileapi/file_system_operation_impl_write_unittest.cc
+++ b/storage/browser/fileapi/file_system_operation_impl_write_unittest.cc
@@ -52,8 +52,7 @@
class FileSystemOperationImplWriteTest : public testing::Test {
public:
FileSystemOperationImplWriteTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
status_(base::File::FILE_OK),
cancel_status_(base::File::FILE_ERROR_FAILED),
bytes_written_(0),
@@ -146,7 +145,7 @@
return blob_storage_context_.get();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
scoped_refptr<MockQuotaManager> quota_manager_;
diff --git a/storage/browser/fileapi/file_system_quota_client_unittest.cc b/storage/browser/fileapi/file_system_quota_client_unittest.cc
index 354792ba..a80ecf6 100644
--- a/storage/browser/fileapi/file_system_quota_client_unittest.cc
+++ b/storage/browser/fileapi/file_system_quota_client_unittest.cc
@@ -232,7 +232,7 @@
}
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
int64_t usage_;
int additional_callback_count_;
diff --git a/storage/browser/fileapi/file_system_usage_cache_unittest.cc b/storage/browser/fileapi/file_system_usage_cache_unittest.cc
index 663fbf8..4970db49 100644
--- a/storage/browser/fileapi/file_system_usage_cache_unittest.cc
+++ b/storage/browser/fileapi/file_system_usage_cache_unittest.cc
@@ -43,7 +43,7 @@
private:
base::test::ScopedFeatureList feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir data_dir_;
FileSystemUsageCache usage_cache_;
diff --git a/storage/browser/fileapi/file_writer_delegate_unittest.cc b/storage/browser/fileapi/file_writer_delegate_unittest.cc
index cb4e4581..64e5cbb 100644
--- a/storage/browser/fileapi/file_writer_delegate_unittest.cc
+++ b/storage/browser/fileapi/file_writer_delegate_unittest.cc
@@ -94,8 +94,7 @@
class FileWriterDelegateTest : public PlatformTest {
public:
FileWriterDelegateTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO) {}
protected:
void SetUp() override;
@@ -166,7 +165,7 @@
}
// This should be alive until the very end of this instance.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
std::unique_ptr<storage::BlobStorageContext> blob_context_;
diff --git a/storage/browser/fileapi/local_file_stream_reader_unittest.cc b/storage/browser/fileapi/local_file_stream_reader_unittest.cc
index 01f7ea5..27d3aad 100644
--- a/storage/browser/fileapi/local_file_stream_reader_unittest.cc
+++ b/storage/browser/fileapi/local_file_stream_reader_unittest.cc
@@ -105,8 +105,8 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
base::Thread file_thread_;
base::ScopedTempDir dir_;
base::Time test_file_modification_time_;
diff --git a/storage/browser/fileapi/local_file_stream_writer_unittest.cc b/storage/browser/fileapi/local_file_stream_writer_unittest.cc
index ccf3da6..e4b68ba 100644
--- a/storage/browser/fileapi/local_file_stream_writer_unittest.cc
+++ b/storage/browser/fileapi/local_file_stream_writer_unittest.cc
@@ -73,8 +73,8 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::IO};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::IO};
base::Thread file_thread_;
base::ScopedTempDir temp_dir_;
};
diff --git a/storage/browser/fileapi/local_file_util_unittest.cc b/storage/browser/fileapi/local_file_util_unittest.cc
index b0b58e6..eb45350 100644
--- a/storage/browser/fileapi/local_file_util_unittest.cc
+++ b/storage/browser/fileapi/local_file_util_unittest.cc
@@ -122,7 +122,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FileSystemContext> file_system_context_;
base::ScopedTempDir data_dir_;
diff --git a/storage/browser/fileapi/obfuscated_file_util_unittest.cc b/storage/browser/fileapi/obfuscated_file_util_unittest.cc
index 09b3fd6..2b0dac69 100644
--- a/storage/browser/fileapi/obfuscated_file_util_unittest.cc
+++ b/storage/browser/fileapi/obfuscated_file_util_unittest.cc
@@ -169,8 +169,7 @@
public ::testing::WithParamInterface<TestMode> {
public:
ObfuscatedFileUtilTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
origin_(GURL("http://www.example.com")),
type_(storage::kFileSystemTypeTemporary),
sandbox_file_system_(origin_, type_),
@@ -234,7 +233,7 @@
ASSERT_TRUE(IsDirectoryEmpty(data_dir_.GetPath()));
quota_manager_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
sandbox_file_system_.TearDown();
}
@@ -333,7 +332,7 @@
}
int64_t SizeInUsageFile() {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t usage = 0;
return usage_cache()->GetUsage(
sandbox_file_system_.GetUsageCachePath(), &usage) ? usage : -1;
@@ -474,7 +473,7 @@
test_(test) {}
~UsageVerifyHelper() {
- test_->scoped_task_environment_.RunUntilIdle();
+ test_->task_environment_.RunUntilIdle();
Check();
}
@@ -750,7 +749,7 @@
// still alive.
file_util->db_flush_delay_seconds_ = 0;
file_util->MarkUsed();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
ASSERT_TRUE(file_util->origin_database_ == nullptr);
}
@@ -767,7 +766,7 @@
}
// At this point the callback is still in the message queue but OFU is gone.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void DestroyDirectoryDatabase_IsolatedTestBody() {
@@ -835,7 +834,7 @@
bool is_incognito_;
base::test::ScopedFeatureList feature_list_;
std::unique_ptr<leveldb::Env> incognito_leveldb_environment_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir data_dir_;
scoped_refptr<MockSpecialStoragePolicy> storage_policy_;
scoped_refptr<storage::QuotaManager> quota_manager_;
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend_unittest.cc b/storage/browser/fileapi/plugin_private_file_system_backend_unittest.cc
index 53b33b4..a10fe55b 100644
--- a/storage/browser/fileapi/plugin_private_file_system_backend_unittest.cc
+++ b/storage/browser/fileapi/plugin_private_file_system_backend_unittest.cc
@@ -69,7 +69,7 @@
const base::FilePath& base_path() const { return backend()->base_path(); }
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<FileSystemContext> context_;
};
diff --git a/storage/browser/fileapi/quota/quota_backend_impl_unittest.cc b/storage/browser/fileapi/quota/quota_backend_impl_unittest.cc
index bbda5e9..18cf68e 100644
--- a/storage/browser/fileapi/quota/quota_backend_impl_unittest.cc
+++ b/storage/browser/fileapi/quota/quota_backend_impl_unittest.cc
@@ -159,7 +159,7 @@
}
base::test::ScopedFeatureList feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir data_dir_;
std::unique_ptr<leveldb::Env> in_memory_env_;
std::unique_ptr<ObfuscatedFileUtil> file_util_;
diff --git a/storage/browser/fileapi/quota/quota_reservation_manager_unittest.cc b/storage/browser/fileapi/quota/quota_reservation_manager_unittest.cc
index 4a5dd3a5..8c19546 100644
--- a/storage/browser/fileapi/quota/quota_reservation_manager_unittest.cc
+++ b/storage/browser/fileapi/quota/quota_reservation_manager_unittest.cc
@@ -211,7 +211,7 @@
const base::FilePath& file_path() const { return file_path_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir work_dir_;
base::FilePath file_path_;
std::unique_ptr<QuotaReservationManager> reservation_manager_;
diff --git a/storage/browser/fileapi/recursive_operation_delegate_unittest.cc b/storage/browser/fileapi/recursive_operation_delegate_unittest.cc
index 37cc39dd..e1d56a93 100644
--- a/storage/browser/fileapi/recursive_operation_delegate_unittest.cc
+++ b/storage/browser/fileapi/recursive_operation_delegate_unittest.cc
@@ -191,7 +191,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Common temp base for nondestructive uses.
base::ScopedTempDir base_;
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
index baaf6c6..d26d6b9 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
+++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate_unittest.cc
@@ -59,7 +59,7 @@
&SandboxFileSystemBackendDelegateTest::OpenFileSystemCallback,
base::Unretained(this)),
GURL());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
int callback_count() const { return callback_count_; }
@@ -79,7 +79,7 @@
}
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockQuotaManagerProxy> quota_manager_proxy_;
std::unique_ptr<storage::SandboxFileSystemBackendDelegate> delegate_;
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc b/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc
index 5bbf93bb..65d2ab0 100644
--- a/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc
+++ b/storage/browser/fileapi/sandbox_file_system_backend_unittest.cc
@@ -147,7 +147,7 @@
std::unique_ptr<leveldb::Env> incognito_env_override_;
base::ScopedTempDir data_dir_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<storage::SandboxFileSystemBackendDelegate> delegate_;
std::unique_ptr<storage::SandboxFileSystemBackend> backend_;
base::test::ScopedFeatureList feature_list_;
diff --git a/storage/browser/fileapi/transient_file_util_unittest.cc b/storage/browser/fileapi/transient_file_util_unittest.cc
index 4994ec5c..f25dae3 100644
--- a/storage/browser/fileapi/transient_file_util_unittest.cc
+++ b/storage/browser/fileapi/transient_file_util_unittest.cc
@@ -69,7 +69,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir data_dir_;
scoped_refptr<storage::FileSystemContext> file_system_context_;
std::unique_ptr<storage::TransientFileUtil> transient_file_util_;
diff --git a/storage/browser/quota/quota_database_unittest.cc b/storage/browser/quota/quota_database_unittest.cc
index a1911ff..f92e6a8 100644
--- a/storage/browser/quota/quota_database_unittest.cc
+++ b/storage/browser/quota/quota_database_unittest.cc
@@ -575,7 +575,7 @@
db->CommitTransaction();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(QuotaDatabaseTest, LazyOpen) {
diff --git a/storage/browser/quota/quota_manager_unittest.cc b/storage/browser/quota/quota_manager_unittest.cc
index 1c67424..4621a4e 100644
--- a/storage/browser/quota/quota_manager_unittest.cc
+++ b/storage/browser/quota/quota_manager_unittest.cc
@@ -98,7 +98,7 @@
void TearDown() override {
// Make sure the quota manager cleans up correctly.
quota_manager_ = nullptr;
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
protected:
@@ -479,7 +479,7 @@
protected:
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
private:
base::Time IncrementMockTime() {
@@ -536,7 +536,7 @@
CreateClient(kData2, base::size(kData2), QuotaClient::kDatabase));
GetUsageInfo();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(4U, usage_info().size());
for (size_t i = 0; i < usage_info().size(); ++i) {
@@ -565,20 +565,20 @@
CreateClient(kData, base::size(kData), QuotaClient::kFileSystem));
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(80, usage());
EXPECT_EQ(0, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_LE(0, quota());
int64_t quota_returned_for_foo = quota();
GetUsageAndQuotaForWebApps(ToOrigin("http://bar.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(quota_returned_for_foo, quota());
@@ -586,30 +586,30 @@
TEST_F(QuotaManagerTest, GetUsage_NoClient) {
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_EQ(0, unlimited_usage());
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_EQ(0, unlimited_usage());
}
@@ -617,30 +617,30 @@
TEST_F(QuotaManagerTest, GetUsage_EmptyClient) {
RegisterClient(CreateClient(nullptr, 0, QuotaClient::kFileSystem));
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_EQ(0, unlimited_usage());
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_EQ(0, unlimited_usage());
}
@@ -663,7 +663,7 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, kMustRemainAvailableForSystem);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
@@ -672,7 +672,7 @@
EXPECT_EQ(kPerHostQuota, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://bar.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(5 + 7, usage());
EXPECT_EQ(kPerHostQuota, quota());
@@ -702,37 +702,37 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, kMustRemainAvailableForSystem);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(1 + 128, usage());
EXPECT_EQ(kPerHostQuota, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://bar.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4, usage());
EXPECT_EQ(0, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(512, usage());
EXPECT_EQ(available_space() + usage(), quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(8, usage());
EXPECT_EQ(available_space() + usage(), quota());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(1 + 2 + 128 + 512, usage());
EXPECT_EQ(512, unlimited_usage());
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4 + 8 + 256, usage());
EXPECT_EQ(8, unlimited_usage());
@@ -761,7 +761,7 @@
RegisterClient(client3);
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(80, usage());
usage_breakdown_expected.fileSystem = 80;
@@ -770,7 +770,7 @@
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(1 + 4 + 8, usage());
usage_breakdown_expected.fileSystem = 1;
@@ -779,7 +779,7 @@
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://bar.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
usage_breakdown_expected.fileSystem = 0;
@@ -793,24 +793,24 @@
blink::mojom::UsageBreakdown();
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetHostUsageBreakdown("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetHostUsageBreakdown("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
}
@@ -827,14 +827,14 @@
CreateClient(kData, base::size(kData), QuotaClient::kFileSystem));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
usage_breakdown_expected.fileSystem = 10 + 20;
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://bar.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(5 + 7, usage());
usage_breakdown_expected.fileSystem = 5 + 7;
@@ -862,7 +862,7 @@
CreateClient(kData2, base::size(kData2), QuotaClient::kDatabase));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(1 + 128, usage());
usage_breakdown_expected.fileSystem = 1;
@@ -870,7 +870,7 @@
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://bar.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4, usage());
usage_breakdown_expected.fileSystem = 4;
@@ -878,7 +878,7 @@
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(512, usage());
usage_breakdown_expected.fileSystem = 0;
@@ -886,7 +886,7 @@
EXPECT_TRUE(usage_breakdown_expected.Equals(usage_breakdown()));
GetUsageAndQuotaWithBreakdown(ToOrigin("http://unlimited/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(8, usage());
usage_breakdown_expected.fileSystem = 8;
@@ -904,7 +904,7 @@
RegisterClient(client);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
@@ -913,19 +913,19 @@
client->AddOriginAndNotify(ToOrigin("https://foo.com/"), type, 1);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20 + 30 - 5 + 1, usage());
int foo_usage = usage();
client->AddOriginAndNotify(ToOrigin("http://bar.com/"), type, 40);
GetUsageAndQuotaForWebApps(ToOrigin("http://bar.com/"), type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(40, usage());
GetGlobalUsage(type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(foo_usage + 40, usage());
EXPECT_EQ(0, unlimited_usage());
}
@@ -951,7 +951,7 @@
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
EXPECT_EQ(kPerHostQuota, quota());
@@ -960,7 +960,7 @@
RunAdditionalUsageAndQuotaTask(ToOrigin("http://foo.com/"), kTemp);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
RunAdditionalUsageAndQuotaTask(ToOrigin("http://bar.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
EXPECT_EQ(kPerHostQuota, quota());
@@ -990,7 +990,7 @@
// Nuke before waiting for callbacks.
set_quota_manager(nullptr);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kErrorAbort, status());
}
@@ -1010,23 +1010,23 @@
// quota calculations for an individual origin, so despite global usage
// in excess of our poolsize, we still get the nominal quota value.
GetStorageCapacity();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_LE(kMustRemainAvailableForSystem, available_space());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage1/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(1, usage());
EXPECT_EQ(kPerHostQuota, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage10/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_EQ(kPerHostQuota, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage200/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(200, usage());
EXPECT_EQ(kPerHostQuota, quota()); // should be clamped to the nominal quota
@@ -1048,30 +1048,30 @@
const int kPerHostQuotaFor1000 = 200;
SetQuotaSettings(1000, kPerHostQuotaFor1000, kMustRemainAvailableForSystem);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(10 + 50 + 4000, usage());
EXPECT_EQ(4000, unlimited_usage());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage10/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_EQ(kPerHostQuotaFor1000, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage50/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(50, usage());
EXPECT_EQ(kPerHostQuotaFor1000, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4000, usage());
EXPECT_EQ(available_space() + usage(), quota());
GetUsageAndQuotaForStorageClient(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(QuotaManager::kNoLimit, quota());
@@ -1081,25 +1081,25 @@
SetQuotaSettings(100, kPerHostQuotaFor100, kMustRemainAvailableForSystem);
GetUsageAndQuotaForWebApps(ToOrigin("http://usage10/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage50/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(50, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4000, usage());
EXPECT_EQ(available_space() + usage(), quota());
GetUsageAndQuotaForStorageClient(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(QuotaManager::kNoLimit, quota());
@@ -1109,30 +1109,30 @@
mock_special_storage_policy()->NotifyCleared();
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(10 + 50 + 4000, usage());
EXPECT_EQ(0, unlimited_usage());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage10/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://usage50/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(50, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4000, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
GetUsageAndQuotaForStorageClient(ToOrigin("http://unlimited/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(4000, usage());
EXPECT_EQ(kPerHostQuotaFor100, quota());
@@ -1164,11 +1164,11 @@
RegisterClient(CreateClient(nullptr, 0, QuotaClient::kFileSystem));
GetPersistentHostQuota("foo.com");
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, quota());
SetPersistentHostQuota("foo.com", 100);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(100, quota());
GetPersistentHostQuota("foo.com");
@@ -1176,14 +1176,14 @@
GetPersistentHostQuota("foo.com");
SetPersistentHostQuota("foo.com", QuotaManager::kPerHostPersistentQuotaLimit);
GetPersistentHostQuota("foo.com");
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaManager::kPerHostPersistentQuotaLimit, quota());
// Persistent quota should be capped at the per-host quota limit.
SetPersistentHostQuota("foo.com",
QuotaManager::kPerHostPersistentQuotaLimit + 100);
GetPersistentHostQuota("foo.com");
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaManager::kPerHostPersistentQuotaLimit, quota());
}
@@ -1192,14 +1192,14 @@
RegisterClient(CreateClient(nullptr, 0, QuotaClient::kFileSystem));
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(0, quota());
SetPersistentHostQuota("foo.com", 100);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(100, quota());
@@ -1207,13 +1207,13 @@
// The actual space avaialble is given to 'unlimited' origins as their quota.
mock_special_storage_policy()->AddUnlimited(GURL("http://unlimited/"));
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(available_space() + usage(), quota());
// GetUsageAndQuotaForStorageClient should just return 0 usage and
// kNoLimit quota.
GetUsageAndQuotaForStorageClient(ToOrigin("http://unlimited/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, usage());
EXPECT_EQ(QuotaManager::kNoLimit, quota());
}
@@ -1243,7 +1243,7 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, kMustRemainAvailable);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(100000, usage());
EXPECT_GT(kPerHostQuota, quota());
@@ -1275,7 +1275,7 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, kMustRemainAvailable);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(100000, usage());
EXPECT_EQ(kPerHostQuota, quota());
@@ -1293,7 +1293,7 @@
// kAvailableSpaceForApp as syncable quota (because of the pre-condition).
mock_special_storage_policy()->AddUnlimited(GURL("http://unlimited/"));
GetUsageAndQuotaForWebApps(ToOrigin("http://unlimited/"), kSync);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, usage());
EXPECT_EQ(kAvailableSpaceForApp, quota());
@@ -1315,7 +1315,7 @@
SetPersistentHostQuota("foo.com", 100);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20 + 13 + 19, usage());
EXPECT_EQ(100, quota());
@@ -1339,7 +1339,7 @@
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
EXPECT_EQ(100, quota());
@@ -1348,7 +1348,7 @@
RunAdditionalUsageAndQuotaTask(ToOrigin("http://foo.com/"), kPerm);
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
RunAdditionalUsageAndQuotaTask(ToOrigin("http://bar.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10 + 20, usage());
EXPECT_EQ(2, additional_callback_count());
@@ -1372,7 +1372,7 @@
// Nuke before waiting for callbacks.
set_quota_manager(nullptr);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kErrorAbort, status());
}
@@ -1390,21 +1390,21 @@
CreateClient(kData, base::size(kData), QuotaClient::kFileSystem));
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 1 + 20 + 600000);
EXPECT_EQ(0, unlimited_usage());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000);
EXPECT_EQ(0, unlimited_usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 1 + 20);
GetHostUsage("buz.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 4000 + 50000);
}
@@ -1424,37 +1424,37 @@
RegisterClient(client);
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 1 + 20 + 600000);
EXPECT_EQ(0, unlimited_usage());
client->ModifyOriginAndNotify(ToOrigin("http://foo.com/"), kPerm, 80000000);
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 1 + 20 + 600000 + 80000000);
EXPECT_EQ(0, unlimited_usage());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000);
EXPECT_EQ(0, unlimited_usage());
client->ModifyOriginAndNotify(ToOrigin("http://foo.com/"), kTemp, 1);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 300 + 4000 + 50000 + 7000000 + 1);
EXPECT_EQ(0, unlimited_usage());
GetHostUsage("buz.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 4000 + 50000);
client->ModifyOriginAndNotify(ToOrigin("http://buz.com/"), kTemp, 900000000);
GetHostUsage("buz.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(usage(), 4000 + 50000 + 900000000);
}
@@ -1470,37 +1470,37 @@
RegisterClient(client);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_pers = usage();
DeleteClientOriginData(client, ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp - 1, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_tmp - 1, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_pers, usage());
}
TEST_F(QuotaManagerTest, GetStorageCapacity) {
GetStorageCapacity();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_LE(0, total_space());
EXPECT_LE(0, available_space());
}
@@ -1527,15 +1527,15 @@
RegisterClient(client2);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_pers = usage();
for (size_t i = 0; i < base::size(kData1); ++i)
@@ -1546,13 +1546,13 @@
quota_manager()->NotifyStorageAccessed(
QuotaClient::kUnknown, url::Origin::Create(GURL(kData2[i].origin)),
kData2[i].type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EvictOriginData(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DumpOriginInfoTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
for (const auto& entry : origin_info_entries()) {
if (entry.type == kTemp)
@@ -1560,15 +1560,15 @@
}
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp - (1 + 50000), usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_tmp - (1 + 50000), usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_pers, usage());
}
@@ -1584,10 +1584,10 @@
RegisterClient(client);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EvictOriginData(kOrigin, kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Ensure used count and time since access are recorded.
histograms.ExpectTotalCount(
@@ -1605,13 +1605,13 @@
// Change the used count of the origin.
quota_manager()->NotifyStorageAccessed(QuotaClient::kUnknown, kOrigin, kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EvictOriginData(kOrigin, kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// The new used count should be logged.
histograms.ExpectTotalCount(
@@ -1628,7 +1628,7 @@
client->AddOriginAndNotify(kOrigin, kTemp, 100);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DeleteOriginFromDatabase(kOrigin, kTemp);
@@ -1650,21 +1650,21 @@
RegisterClient(client);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_pers = usage();
for (size_t i = 0; i < base::size(kData); ++i)
NotifyStorageAccessed(client, url::Origin::Create(GURL(kData[i].origin)),
kData[i].type);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
client->AddOriginToErrorSet(ToOrigin("http://foo.com/"), kTemp);
@@ -1672,12 +1672,12 @@
i < QuotaManager::kThresholdOfErrorsToBeBlacklisted + 1;
++i) {
EvictOriginData(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kErrorInvalidModification, status());
}
DumpOriginInfoTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
bool found_origin_in_database = false;
for (const auto& entry : origin_info_entries()) {
@@ -1691,32 +1691,32 @@
for (size_t i = 0; i < kNumberOfTemporaryOrigins - 1; ++i) {
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(eviction_origin().has_value());
// The origin "http://foo.com/" should not be in the LRU list.
EXPECT_NE(std::string("http://foo.com/"),
eviction_origin()->GetURL().spec());
DeleteOriginFromDatabase(*eviction_origin(), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Now the LRU list must be empty.
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(eviction_origin().has_value());
// Deleting origins from the database should not affect the results of the
// following checks.
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_tmp, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_pers, usage());
}
@@ -1738,7 +1738,7 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, kMustRemainAvailableForSystem);
GetEvictionRoundInfo();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(21, usage());
EXPECT_EQ(kPoolSize, settings().pool_size);
@@ -1754,47 +1754,47 @@
RegisterClient(client);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
int64_t predelete_host_pers = usage();
DeleteHostData(std::string(), kTemp, kAllClients);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_tmp, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_pers, usage());
DeleteHostData("foo.com", kTemp, kAllClients);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp - 1, usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_tmp - 1, usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_host_pers, usage());
}
@@ -1820,35 +1820,35 @@
RegisterClient(client2);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
GetHostUsage("bar.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_bar_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_pers = usage();
GetHostUsage("bar.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_bar_pers = usage();
reset_status_callback_count();
DeleteHostData("foo.com", kTemp, kAllClients);
DeleteHostData("bar.com", kTemp, kAllClients);
DeleteHostData("foo.com", kTemp, kAllClients);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(3, status_callback_count());
DumpOriginInfoTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
for (const auto& entry : origin_info_entries()) {
if (entry.type != kTemp)
@@ -1861,24 +1861,24 @@
}
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp - (1 + 20 + 4000 + 50000 + 6000 + 80 + 9),
usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - (1 + 20 + 50000 + 6000 + 80), usage());
GetHostUsage("bar.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_bar_tmp - (4000 + 9), usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_pers, usage());
GetHostUsage("bar.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_bar_pers, usage());
}
@@ -1906,23 +1906,23 @@
RegisterClient(client2);
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_global_tmp = usage();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
GetHostUsage("bar.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_bar_tmp = usage();
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_pers = usage();
GetHostUsage("bar.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_bar_pers = usage();
for (size_t i = 0; i < base::size(kData1); ++i) {
@@ -1935,18 +1935,18 @@
QuotaClient::kUnknown, url::Origin::Create(GURL(kData2[i].origin)),
kData2[i].type);
}
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
reset_status_callback_count();
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp, kAllClients);
DeleteOriginData(ToOrigin("http://bar.com/"), kTemp, kAllClients);
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp, kAllClients);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(3, status_callback_count());
DumpOriginInfoTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
for (const auto& entry : origin_info_entries()) {
if (entry.type != kTemp)
@@ -1957,23 +1957,23 @@
}
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_global_tmp - (1 + 4000 + 50000 + 9), usage());
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - (1 + 50000), usage());
GetHostUsage("bar.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_bar_tmp - (4000 + 9), usage());
GetHostUsage("foo.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_pers, usage());
GetHostUsage("bar.com", kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_bar_pers, usage());
}
@@ -1995,17 +1995,17 @@
EXPECT_TRUE(origins.empty());
GetHostUsage("a.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetCachedOrigins(kTemp, &origins);
EXPECT_EQ(2U, origins.size());
GetHostUsage("b.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetCachedOrigins(kTemp, &origins);
EXPECT_EQ(2U, origins.size());
GetHostUsage("c.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetCachedOrigins(kTemp, &origins);
EXPECT_EQ(3U, origins.size());
@@ -2013,7 +2013,7 @@
EXPECT_TRUE(origins.empty());
GetGlobalUsage(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetCachedOrigins(kTemp, &origins);
EXPECT_EQ(3U, origins.size());
@@ -2037,29 +2037,29 @@
GURL origin;
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(eviction_origin().has_value());
NotifyStorageAccessed(client, ToOrigin("http://a.com/"), kTemp);
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ("http://a.com/", eviction_origin()->GetURL().spec());
NotifyStorageAccessed(client, ToOrigin("http://b.com/"), kPerm);
NotifyStorageAccessed(client, ToOrigin("https://a.com/"), kTemp);
NotifyStorageAccessed(client, ToOrigin("http://c.com/"), kTemp);
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ("http://a.com/", eviction_origin()->GetURL().spec());
DeleteOriginFromDatabase(*eviction_origin(), kTemp);
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ("https://a.com/", eviction_origin()->GetURL().spec());
DeleteOriginFromDatabase(*eviction_origin(), kTemp);
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ("http://c.com/", eviction_origin()->GetURL().spec());
}
@@ -2077,7 +2077,7 @@
GURL origin;
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(eviction_origin().has_value());
NotifyStorageAccessed(client, ToOrigin("http://a.com/"), kTemp);
@@ -2086,19 +2086,19 @@
NotifyStorageAccessed(client, ToOrigin("http://c.com/"), kTemp);
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(ToOrigin("http://a.com/"), *eviction_origin());
// Notify origin http://a.com is in use.
NotifyOriginInUse(ToOrigin("http://a.com/"));
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(ToOrigin("https://a.com/"), *eviction_origin());
// Notify origin https://a.com is in use while GetEvictionOrigin is running.
GetEvictionOrigin(kTemp);
NotifyOriginInUse(ToOrigin("https://a.com/"));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Post-filtering must have excluded the returned origin, so we will
// see empty result here.
EXPECT_FALSE(eviction_origin().has_value());
@@ -2106,7 +2106,7 @@
// Notify access for http://c.com while GetEvictionOrigin is running.
GetEvictionOrigin(kTemp);
NotifyStorageAccessed(client, ToOrigin("http://c.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Post-filtering must have excluded the returned origin, so we will
// see empty result here.
EXPECT_FALSE(eviction_origin().has_value());
@@ -2114,7 +2114,7 @@
NotifyOriginNoLongerInUse(ToOrigin("http://a.com/"));
NotifyOriginNoLongerInUse(ToOrigin("https://a.com/"));
GetEvictionOrigin(kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(ToOrigin("http://a.com/"), *eviction_origin());
}
@@ -2131,7 +2131,7 @@
RegisterClient(client);
GetOriginsModifiedSince(kTemp, base::Time());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(modified_origins().empty());
EXPECT_EQ(modified_origins_type(), kTemp);
@@ -2145,7 +2145,7 @@
base::Time time3 = client->IncrementMockTime();
GetOriginsModifiedSince(kTemp, time1);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(4U, modified_origins().size());
EXPECT_EQ(modified_origins_type(), kTemp);
for (size_t i = 0; i < base::size(kData); ++i) {
@@ -2154,18 +2154,18 @@
}
GetOriginsModifiedSince(kTemp, time2);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(2U, modified_origins().size());
GetOriginsModifiedSince(kTemp, time3);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(modified_origins().empty());
EXPECT_EQ(modified_origins_type(), kTemp);
client->ModifyOriginAndNotify(ToOrigin("http://a.com/"), kTemp, 10);
GetOriginsModifiedSince(kTemp, time3);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(1U, modified_origins().size());
EXPECT_EQ(1U, modified_origins().count(ToOrigin("http://a.com/")));
EXPECT_EQ(modified_origins_type(), kTemp);
@@ -2175,10 +2175,10 @@
SetPersistentHostQuota("example1.com", 1);
SetPersistentHostQuota("example2.com", 20);
SetPersistentHostQuota("example3.com", 300);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DumpQuotaTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const QuotaTableEntry kEntries[] = {
QuotaTableEntry("example1.com", kPerm, 1),
@@ -2204,10 +2204,10 @@
QuotaClient::kUnknown, ToOrigin("http://example.com/"), kPerm);
quota_manager()->NotifyStorageAccessed(
QuotaClient::kUnknown, ToOrigin("http://example.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
DumpOriginInfoTable();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
using TypedOrigin = std::pair<GURL, StorageType>;
using Entry = std::pair<TypedOrigin, int>;
@@ -2231,12 +2231,12 @@
TEST_F(QuotaManagerTest, QuotaForEmptyHost) {
GetPersistentHostQuota(std::string());
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(0, quota());
SetPersistentHostQuota(std::string(), 10);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kErrorNotSupported, status());
}
@@ -2267,33 +2267,33 @@
RegisterClient(client4);
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp,
QuotaClient::kFileSystem);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 1, usage());
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp, QuotaClient::kAppcache);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage());
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp, QuotaClient::kDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 4 - 2 - 1, usage());
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp,
QuotaClient::kIndexedDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage());
}
@@ -2324,31 +2324,31 @@
RegisterClient(client4);
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
DeleteHostData("foo.com", kTemp, QuotaClient::kFileSystem);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 1, usage());
DeleteHostData("foo.com", kTemp, QuotaClient::kAppcache);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage());
DeleteHostData("foo.com", kTemp, QuotaClient::kDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 4 - 2 - 1, usage());
DeleteHostData("foo.com", kTemp, QuotaClient::kIndexedDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage());
}
@@ -2379,21 +2379,21 @@
RegisterClient(client4);
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp,
QuotaClient::kFileSystem | QuotaClient::kDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 4 - 1, usage());
DeleteOriginData(ToOrigin("http://foo.com/"), kTemp,
QuotaClient::kAppcache | QuotaClient::kIndexedDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage());
}
@@ -2424,21 +2424,21 @@
RegisterClient(client4);
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
const int64_t predelete_foo_tmp = usage();
DeleteHostData("foo.com", kTemp,
QuotaClient::kFileSystem | QuotaClient::kAppcache);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 2 - 1, usage());
DeleteHostData("foo.com", kTemp,
QuotaClient::kDatabase | QuotaClient::kIndexedDatabase);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetHostUsage("foo.com", kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(predelete_foo_tmp - 8 - 4 - 2 - 1, usage());
}
@@ -2455,10 +2455,10 @@
// Query global usage to warmup the usage tracker caching.
GetGlobalUsage(kTemp);
GetGlobalUsage(kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(80, usage());
EXPECT_EQ(0, quota());
@@ -2468,25 +2468,25 @@
SetQuotaSettings(kPoolSize, kPerHostQuota, INT64_C(0));
GetStorageCapacity();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kPoolSize, total_space());
EXPECT_EQ(kPoolSize - 80 - 10, available_space());
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_LE(kPerHostQuota, quota());
mock_special_storage_policy()->AddUnlimited(GURL("http://foo.com/"));
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(80, usage());
EXPECT_EQ(available_space() + usage(), quota());
GetUsageAndQuotaForWebApps(ToOrigin("http://foo.com/"), kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(QuotaStatusCode::kOk, status());
EXPECT_EQ(10, usage());
EXPECT_EQ(available_space() + usage(), quota());
@@ -2497,11 +2497,11 @@
mock_special_storage_policy()->AddSessionOnly(kEpheremalOrigin.GetURL());
GetUsageAndQuotaForWebApps(kEpheremalOrigin, kTemp);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(quota_manager()->settings().session_only_per_host_quota, quota());
GetUsageAndQuotaForWebApps(kEpheremalOrigin, kPerm);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(0, quota());
}
diff --git a/storage/browser/quota/quota_settings_unittest.cc b/storage/browser/quota/quota_settings_unittest.cc
index f86bd31..67e64bc 100644
--- a/storage/browser/quota/quota_settings_unittest.cc
+++ b/storage/browser/quota/quota_settings_unittest.cc
@@ -33,7 +33,7 @@
protected:
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
const base::FilePath& profile_path() const { return data_dir_.GetPath(); }
private:
@@ -61,7 +61,7 @@
// 750 = 1500 * PerHostRatio
EXPECT_EQ(settings->per_host_quota, 750);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(callback_executed);
}
@@ -80,7 +80,7 @@
EXPECT_EQ(settings->pool_size, 2000);
EXPECT_EQ(settings->per_host_quota, 2000);
}));
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(callback_executed);
}
} // namespace storage
diff --git a/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc b/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc
index cf5f922..724c396 100644
--- a/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc
+++ b/storage/browser/quota/quota_temporary_storage_evictor_unittest.cc
@@ -214,7 +214,7 @@
return num_get_usage_and_quota_for_eviction_;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MockQuotaEvictionHandler> quota_eviction_handler_;
std::unique_ptr<QuotaTemporaryStorageEvictor> temporary_storage_evictor_;
int num_get_usage_and_quota_for_eviction_;
diff --git a/storage/browser/quota/usage_tracker_unittest.cc b/storage/browser/quota/usage_tracker_unittest.cc
index 720d756..1030555 100644
--- a/storage/browser/quota/usage_tracker_unittest.cc
+++ b/storage/browser/quota/usage_tracker_unittest.cc
@@ -228,7 +228,7 @@
return client_list;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<MockSpecialStoragePolicy> storage_policy_;
MockQuotaClient quota_client_;
diff --git a/storage/browser/test/mock_quota_manager_unittest.cc b/storage/browser/test/mock_quota_manager_unittest.cc
index 94e83fd..3b52fc5 100644
--- a/storage/browser/test/mock_quota_manager_unittest.cc
+++ b/storage/browser/test/mock_quota_manager_unittest.cc
@@ -97,7 +97,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::ScopedTempDir data_dir_;
scoped_refptr<MockQuotaManager> manager_;
scoped_refptr<MockSpecialStoragePolicy> policy_;
diff --git a/third_party/blink/common/messaging/string_message_codec_unittest.cc b/third_party/blink/common/messaging/string_message_codec_unittest.cc
index 1f858bce..b9354e09 100644
--- a/third_party/blink/common/messaging/string_message_codec_unittest.cc
+++ b/third_party/blink/common/messaging/string_message_codec_unittest.cc
@@ -13,7 +13,7 @@
namespace {
base::string16 DecodeWithV8(const std::vector<uint8_t>& encoded) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
base::string16 result;
v8::Isolate::CreateParams params;
@@ -46,7 +46,7 @@
}
std::vector<uint8_t> EncodeWithV8(const base::string16& message) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::vector<uint8_t> result;
v8::Isolate::CreateParams params;
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index 14cc7b5..07b68c4 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -175,13 +175,13 @@
static void CreateMainThreadForTesting();
// These are dirty workaround for tests requiring the main thread task runner
- // from a non-main thread. If your test needs base::ScopedTaskEnvironment
+ // from a non-main thread. If your test needs base::TaskEnvironment
// and a non-main thread may call MainThread()->GetTaskRunner(), call
// SetMainThreadTaskRunnerForTesting() in your test fixture's SetUp(), and
// call UnsetMainThreadTaskRunnerForTesting() in TearDown().
//
// TODO(yutak): Ideally, these should be packed in a custom test fixture
- // along with ScopedTaskEnvironment for reusability.
+ // along with TaskEnvironment for reusability.
static void SetMainThreadTaskRunnerForTesting();
static void UnsetMainThreadTaskRunnerForTesting();
diff --git a/third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h b/third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h
index b5b1e80..bbfba8c 100644
--- a/third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h
+++ b/third_party/blink/public/platform/scheduler/test/renderer_scheduler_test_support.h
@@ -25,7 +25,7 @@
// It allows creation of FrameSchedulers and PageSchedulers, but doesn't provide
// any task running infrastructure, relying on the presence of
// ThreadTaskRunnerHandle::Get() instead, meaning that the users also have to
-// create base::debug::ScopedTaskEnvironment.
+// create base::debug::TaskEnvironment.
std::unique_ptr<WebThreadScheduler> CreateWebMainThreadSchedulerForTests();
// Simple scheduling infrastructure for unit tests, with the addition of mocked
diff --git a/third_party/blink/renderer/platform/bindings/parkable_string_test.cc b/third_party/blink/renderer/platform/bindings/parkable_string_test.cc
index b07f73b..c5b6f069 100644
--- a/third_party/blink/renderer/platform/bindings/parkable_string_test.cc
+++ b/third_party/blink/renderer/platform/bindings/parkable_string_test.cc
@@ -21,7 +21,7 @@
#include "third_party/blink/renderer/platform/instrumentation/memory_pressure_listener.h"
using ThreadPoolExecutionMode =
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode;
+ base::test::TaskEnvironment::ThreadPoolExecutionMode;
namespace blink {
@@ -44,12 +44,11 @@
ParkableStringTest(ThreadPoolExecutionMode thread_pool_execution_mode =
ThreadPoolExecutionMode::DEFAULT)
: ::testing::Test(),
- scoped_task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- thread_pool_execution_mode) {}
+ task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ thread_pool_execution_mode) {}
protected:
- void RunPostedTasks() { scoped_task_environment_.RunUntilIdle(); }
+ void RunPostedTasks() { task_environment_.RunUntilIdle(); }
bool ParkAndWait(const ParkableString& string) {
bool success =
@@ -59,8 +58,8 @@
}
void WaitForAging() {
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
- scoped_task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ task_environment_.FastForwardBy(base::TimeDelta::FromSeconds(
ParkableStringManager::kAgingIntervalInSeconds));
}
@@ -76,7 +75,7 @@
expected_count = 1;
}
EXPECT_EQ(expected_count,
- scoped_task_environment_.GetPendingMainThreadTaskCount());
+ task_environment_.GetPendingMainThreadTaskCount());
}
void SetUp() override { ParkableStringManager::Instance().ResetForTesting(); }
@@ -85,7 +84,7 @@
// No leaks.
CHECK_EQ(0u, ParkableStringManager::Instance().Size());
// Delayed tasks may remain, clear the queues.
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
@@ -101,7 +100,7 @@
return parkable;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// The main aim of this test is to check that the compressed size of a string
@@ -526,7 +525,7 @@
ParkableString parkable(MakeLargeString().ReleaseImpl());
EXPECT_TRUE(parkable.Impl()->Park(ParkableStringImpl::ParkingMode::kAlways));
// A main thread task is posted once compression is done.
- while (scoped_task_environment_.GetPendingMainThreadTaskCount() == 0) {
+ while (task_environment_.GetPendingMainThreadTaskCount() == 0) {
parkable.Lock();
parkable.ToString();
parkable.Unlock();
@@ -575,7 +574,7 @@
// No waiting, synchronous compression.
manager.ParkAll(ParkableStringImpl::ParkingMode::kIfCompressedDataExists);
EXPECT_TRUE(parkable.Impl()->is_parked());
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
TEST_F(ParkableStringTest, OnPurgeMemoryInBackground) {
@@ -729,9 +728,9 @@
TEST_F(ParkableStringTest, AgingTicksStopsAndRestarts) {
ParkableString parkable(MakeLargeString().ReleaseImpl());
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
// Nothing more to do, the tick is not re-scheduled.
WaitForAging();
@@ -739,7 +738,7 @@
// Unparking, the tick restarts.
parkable.ToString();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
WaitForAging();
// And stops again. 2 ticks to park the string (age, then park), and one
@@ -758,18 +757,18 @@
ParkableString parkable(MakeLargeString('a').ReleaseImpl());
String retained = parkable.ToString();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
// The only string is referenced externally, nothing aging can change.
CheckOnlyCpuCostTaskRemains();
ParkableString parkable2(MakeLargeString('b').ReleaseImpl());
WaitForAging();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
EXPECT_TRUE(parkable2.Impl()->is_parked());
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
WaitForAging();
// Once |parkable2| has been parked, back to the case where the only
// remaining strings are referenced externally.
@@ -790,9 +789,9 @@
parkable1.ToString();
parkable2.ToString();
- EXPECT_GT(scoped_task_environment_.GetPendingMainThreadTaskCount(), 0u);
+ EXPECT_GT(task_environment_.GetPendingMainThreadTaskCount(), 0u);
// Aging task + stats.
- EXPECT_EQ(2u, scoped_task_environment_.GetPendingMainThreadTaskCount());
+ EXPECT_EQ(2u, task_environment_.GetPendingMainThreadTaskCount());
}
TEST_F(ParkableStringTest, ReportTotalUnparkingTime) {
@@ -823,7 +822,7 @@
}
const size_t compressed_size = parkable.Impl()->compressed_size();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
// The string is unparked kNumIterations times.
histogram_tester.ExpectUniqueSample(
@@ -878,7 +877,7 @@
run_loop.Run();
// The aging task is rescheduled.
- EXPECT_EQ(2u, scoped_task_environment_.GetPendingMainThreadTaskCount());
+ EXPECT_EQ(2u, task_environment_.GetPendingMainThreadTaskCount());
// Complete asynchronous work.
RunPostedTasks();
diff --git a/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc b/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc
index f0ad17e8..2216a220 100644
--- a/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc
+++ b/third_party/blink/renderer/platform/blob/blob_bytes_provider_test.cc
@@ -46,7 +46,7 @@
}
void TearDown() override {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Platform::UnsetMainThreadTaskRunnerForTesting();
}
@@ -60,7 +60,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<RawData> test_data1_;
Vector<uint8_t> test_bytes1_;
diff --git a/third_party/blink/renderer/platform/blob/blob_data_test.cc b/third_party/blink/renderer/platform/blob/blob_data_test.cc
index 4d88214..39e9768 100644
--- a/third_party/blink/renderer/platform/blob/blob_data_test.cc
+++ b/third_party/blink/renderer/platform/blob/blob_data_test.cc
@@ -131,7 +131,7 @@
}
void TearDown() override {
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
Platform::UnsetMainThreadTaskRunnerForTesting();
}
@@ -220,7 +220,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FakeBlobRegistry mock_blob_registry_;
BlobRegistryPtr blob_registry_ptr_;
mojo::Binding<BlobRegistry> blob_registry_binding_;
diff --git a/third_party/blink/renderer/platform/exported/mediastream/media_stream_audio_test.cc b/third_party/blink/renderer/platform/exported/mediastream/media_stream_audio_test.cc
index 7cb47ded..fdbffbf9 100644
--- a/third_party/blink/renderer/platform/exported/mediastream/media_stream_audio_test.cc
+++ b/third_party/blink/renderer/platform/exported/mediastream/media_stream_audio_test.cc
@@ -264,7 +264,7 @@
WebMediaStreamSource blink_audio_source_;
WebMediaStreamTrack blink_audio_track_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Tests that a simple source-->track-->sink connection and audio data flow
diff --git a/third_party/blink/renderer/platform/exported/video_capture/web_video_capture_impl_manager_test.cc b/third_party/blink/renderer/platform/exported/video_capture/web_video_capture_impl_manager_test.cc
index 0bfbce3..9ecf6dd1 100644
--- a/third_party/blink/renderer/platform/exported/video_capture/web_video_capture_impl_manager_test.cc
+++ b/third_party/blink/renderer/platform/exported/video_capture/web_video_capture_impl_manager_test.cc
@@ -221,7 +221,7 @@
base::Unretained(this)));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ScopedTestingPlatformSupport<IOTaskRunnerTestingPlatformSupport> platform_;
base::RunLoop cleanup_run_loop_;
std::unique_ptr<MockVideoCaptureImplManager> manager_;
diff --git a/third_party/blink/renderer/platform/fonts/shaping/caching_word_shaper_test.cc b/third_party/blink/renderer/platform/fonts/shaping/caching_word_shaper_test.cc
index 2f1f95b8..0f64b9c 100644
--- a/third_party/blink/renderer/platform/fonts/shaping/caching_word_shaper_test.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/caching_word_shaper_test.cc
@@ -28,7 +28,7 @@
cache = std::make_unique<ShapeCache>();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FontCachePurgePreventer font_cache_purge_preventer;
FontDescription font_description;
Font font;
diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc
index b5770d0..03623b5 100644
--- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc
+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_shaper_test.cc
@@ -130,7 +130,7 @@
return result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
FontCachePurgePreventer font_cache_purge_preventer;
FontDescription font_description;
Font font;
diff --git a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc
index 42f4fab..26739466 100644
--- a/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc
+++ b/third_party/blink/renderer/platform/graphics/accelerated_static_bitmap_image_test.cc
@@ -57,7 +57,7 @@
void TearDown() override { SharedGpuContext::ResetForTesting(); }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
MockGLES2InterfaceWithSyncTokenSupport gl_;
};
diff --git a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
index cc6c0f4b..ef23d9d 100644
--- a/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
+++ b/third_party/blink/renderer/platform/graphics/video_frame_submitter_test.cc
@@ -159,7 +159,7 @@
context_provider_(viz::TestContextProvider::Create()) {
context_provider_->BindToCurrentThread();
MakeSubmitter();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
void MakeSubmitter() {
@@ -218,7 +218,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::SimpleTestTickClock> now_src_;
std::unique_ptr<viz::FakeExternalBeginFrameSource> begin_frame_source_;
std::unique_ptr<StrictMock<VideoMockCompositorFrameSink>> sink_;
@@ -264,7 +264,7 @@
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsRendering());
}
@@ -275,7 +275,7 @@
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsRendering());
@@ -284,20 +284,20 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// StopRendering submits one more frame.
EXPECT_SUBMISSION(SubmissionType::kStateChange);
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->StopRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// No frames should be produced after StopRendering().
EXPECT_CALL(*sink_, DidNotProduceFrame(_));
begin_frame_source_->CreateBeginFrameArgs(BEGINFRAME_FROM_HERE,
now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, StopUsingProviderNullsProvider) {
@@ -313,7 +313,7 @@
StopUsingProviderSubmitsFrameAndStopsRendering) {
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsRendering());
@@ -321,7 +321,7 @@
EXPECT_SUBMISSION(SubmissionType::kStateChange);
submitter_->StopUsingProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(IsRendering());
}
@@ -330,13 +330,13 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(IsRendering());
EXPECT_SUBMISSION(SubmissionType::kManual);
submitter_->DidReceiveFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, DidReceiveFrameSubmitsFrame) {
@@ -344,31 +344,31 @@
EXPECT_SUBMISSION(SubmissionType::kManual);
submitter_->DidReceiveFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, ShouldSubmitPreventsSubmission) {
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->SetIsSurfaceVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(ShouldSubmit());
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kStateChange);
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->SetIsSurfaceVisible(true);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(ShouldSubmit());
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
EXPECT_CALL(*video_frame_provider_, GetCurrentFrame()).Times(0);
submitter_->SetIsSurfaceVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(ShouldSubmit());
EXPECT_GET_PUT_FRAME();
@@ -380,7 +380,7 @@
TEST_F(VideoFrameSubmitterTest, SetForceSubmitForcesSubmission) {
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->SetIsSurfaceVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(ShouldSubmit());
@@ -390,23 +390,23 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
EXPECT_SUBMISSION(SubmissionType::kStateChange);
submitter_->SetIsSurfaceVisible(true);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(ShouldSubmit());
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
EXPECT_SUBMISSION(SubmissionType::kStateChange);
submitter_->SetIsSurfaceVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_TRUE(ShouldSubmit());
EXPECT_SUBMISSION(SubmissionType::kManual);
SubmitSingleFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, RotationInformationPassedToResourceProvider) {
@@ -427,7 +427,7 @@
EXPECT_CALL(*resource_provider_, ReleaseFrameResources());
submitter_->DidReceiveFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
WTF::Vector<viz::ReturnedResource> resources;
@@ -441,7 +441,7 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
WTF::Vector<viz::ReturnedResource> resources;
@@ -465,7 +465,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
WTF::Vector<viz::ReturnedResource> resources;
@@ -490,20 +490,20 @@
EXPECT_CALL(*resource_provider_, ReleaseFrameResources());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, OnBeginFrameSubmitsFrame) {
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kBeginFrame);
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, MissedFrameArgDoesNotProduceFrame) {
@@ -513,7 +513,7 @@
BEGINFRAME_FROM_HERE, now_src_.get());
args.type = viz::BeginFrameArgs::MISSED;
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, MissingProviderDoesNotProduceFrame) {
@@ -524,7 +524,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, NoUpdateOnFrameDoesNotProduceFrame) {
@@ -538,7 +538,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, NotRenderingDoesNotProduceFrame) {
@@ -551,14 +551,14 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, ReturnsResourceOnCompositorAck) {
WTF::Vector<viz::ReturnedResource> resources;
EXPECT_CALL(*resource_provider_, ReceiveReturnsFromParent(_));
submitter_->DidReceiveCompositorFrameAck(resources);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Tests that after submitting a frame, no frame will be submitted until an ACK
@@ -567,13 +567,13 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kBeginFrame);
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// DidNotProduceFrame should be called because no frame will be submitted
// given that the ACK is still pending.
@@ -588,7 +588,7 @@
args = begin_frame_source_->CreateBeginFrameArgs(BEGINFRAME_FROM_HERE,
new_time.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Test that after context is lost, the CompositorFrameSink is recreated but the
@@ -608,7 +608,7 @@
.Times(1);
submitter_->OnContextLost();
OnReceivedContextProvider(true, context_provider_);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// This test simulates a race condition in which the |video_frame_provider_| is
@@ -617,19 +617,19 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kStateChange);
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->StopUsingProvider();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// OnReceivedContextProvider returns. We don't run the actual function
// because it would overwrite our fake |sink_| with a real one.
SubmitSingleFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
// Test the behaviour of the ChildLocalSurfaceIdAllocator instance. It checks
@@ -651,11 +651,11 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kManual);
SubmitSingleFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
viz::LocalSurfaceId local_surface_id =
@@ -680,7 +680,7 @@
EXPECT_CALL(*resource_provider_, ReleaseFrameResources());
SubmitSingleFrame();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
{
viz::LocalSurfaceId local_surface_id =
@@ -724,7 +724,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(sink_->last_submitted_compositor_frame().size_in_pixels(),
rotated_size);
@@ -755,7 +755,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// 180 deg rotation has same size.
EXPECT_EQ(sink_->last_submitted_compositor_frame().size_in_pixels(),
@@ -785,7 +785,7 @@
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(sink_->last_submitted_compositor_frame().size_in_pixels(),
rotated_size);
@@ -800,26 +800,26 @@
// Hide the page and ensure no begin frames are issued.
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->SetIsPageVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_FALSE(ShouldSubmit());
// Start rendering, but since page is hidden nothing should start yet.
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Mark the page as visible and confirm frame submission.
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
EXPECT_SUBMISSION(SubmissionType::kStateChange);
submitter_->SetIsPageVisible(true);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
// Transition back to the page being hidden and ensure begin frames stop.
EXPECT_TRUE(ShouldSubmit());
EXPECT_CALL(*sink_, SetNeedsBeginFrame(false));
EXPECT_CALL(*video_frame_provider_, GetCurrentFrame()).Times(0);
submitter_->SetIsPageVisible(false);
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
}
TEST_F(VideoFrameSubmitterTest, PreferredInterval) {
@@ -828,13 +828,13 @@
EXPECT_CALL(*sink_, SetNeedsBeginFrame(true));
submitter_->StartRendering();
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_SUBMISSION(SubmissionType::kBeginFrame);
viz::BeginFrameArgs args = begin_frame_source_->CreateBeginFrameArgs(
BEGINFRAME_FROM_HERE, now_src_.get());
submitter_->OnBeginFrame(args, {});
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(sink_->last_submitted_compositor_frame()
.metadata.preferred_frame_interval,
diff --git a/third_party/blink/renderer/platform/heap/heap_test_utilities.h b/third_party/blink/renderer/platform/heap/heap_test_utilities.h
index deee600..dd6da9e9 100644
--- a/third_party/blink/renderer/platform/heap/heap_test_utilities.h
+++ b/third_party/blink/renderer/platform/heap/heap_test_utilities.h
@@ -38,7 +38,7 @@
void CompleteSweepingIfNeeded();
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
template <typename T>
diff --git a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
index bd09b46c..5497f35 100644
--- a/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
+++ b/third_party/blink/renderer/platform/loader/fetch/buffering_bytes_consumer_test.cc
@@ -20,8 +20,7 @@
class BufferingBytesConsumerTest : public testing::Test {
public:
BufferingBytesConsumerTest()
- : task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ : task_environment_(base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
using Command = ReplayingBytesConsumer::Command;
using Result = BytesConsumer::Result;
@@ -40,7 +39,7 @@
return consumer_handle;
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(BufferingBytesConsumerTest, Read) {
diff --git a/third_party/blink/renderer/platform/media/webaudiosourceprovider_impl_test.cc b/third_party/blink/renderer/platform/media/webaudiosourceprovider_impl_test.cc
index e67e1f8..c27ce2ba 100644
--- a/third_party/blink/renderer/platform/media/webaudiosourceprovider_impl_test.cc
+++ b/third_party/blink/renderer/platform/media/webaudiosourceprovider_impl_test.cc
@@ -106,7 +106,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
media::AudioParameters params_;
media::FakeAudioRenderCallback fake_callback_;
diff --git a/third_party/blink/renderer/platform/mojo/geometry_mojom_traits_test.cc b/third_party/blink/renderer/platform/mojo/geometry_mojom_traits_test.cc
index fdb5cf8..7f1f45e 100644
--- a/third_party/blink/renderer/platform/mojo/geometry_mojom_traits_test.cc
+++ b/third_party/blink/renderer/platform/mojo/geometry_mojom_traits_test.cc
@@ -96,7 +96,7 @@
mojo::BindingSet<gfx::mojom::blink::GeometryTraitsTestService>
traits_test_bindings_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(GeometryStructTraitsTest);
};
diff --git a/third_party/blink/renderer/platform/mojo/interface_invalidator_test.cc b/third_party/blink/renderer/platform/mojo/interface_invalidator_test.cc
index 8bbc5cc..5c293c1 100644
--- a/third_party/blink/renderer/platform/mojo/interface_invalidator_test.cc
+++ b/third_party/blink/renderer/platform/mojo/interface_invalidator_test.cc
@@ -97,7 +97,7 @@
~InterfaceInvalidatorTest() override {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(InterfaceInvalidatorTest);
};
diff --git a/third_party/blink/renderer/platform/mojo/kurl_security_origin_test.cc b/third_party/blink/renderer/platform/mojo/kurl_security_origin_test.cc
index f41ec14..b3eb003 100644
--- a/third_party/blink/renderer/platform/mojo/kurl_security_origin_test.cc
+++ b/third_party/blink/renderer/platform/mojo/kurl_security_origin_test.cc
@@ -35,7 +35,7 @@
// Mojo version of chrome IPC test in url/ipc/url_param_traits_unittest.cc.
TEST(KURLSecurityOriginStructTraitsTest, Basic) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
url::mojom::blink::UrlTestPtr proxy;
UrlTestImpl impl(MakeRequest(&proxy));
diff --git a/third_party/blink/renderer/platform/network/encoded_form_data_test.cc b/third_party/blink/renderer/platform/network/encoded_form_data_test.cc
index 85c172a..202b813 100644
--- a/third_party/blink/renderer/platform/network/encoded_form_data_test.cc
+++ b/third_party/blink/renderer/platform/network/encoded_form_data_test.cc
@@ -50,7 +50,7 @@
class EncodedFormDataMojomTraitsTest : public testing::Test {
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(EncodedFormDataTest, DeepCopy) {
diff --git a/third_party/blink/renderer/platform/scheduler/common/scheduler_helper_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/scheduler_helper_unittest.cc
index bee56594..bae463a 100644
--- a/third_party/blink/renderer/platform/scheduler/common/scheduler_helper_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/scheduler_helper_unittest.cc
@@ -52,9 +52,8 @@
public:
SchedulerHelperTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {
sequence_manager_ = base::sequence_manager::SequenceManagerForTest::Create(
nullptr, task_environment_.GetMainThreadTaskRunner(),
task_environment_.GetMockTickClock());
@@ -82,7 +81,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::sequence_manager::SequenceManagerForTest>
sequence_manager_;
std::unique_ptr<NonMainThreadSchedulerHelper> scheduler_helper_;
diff --git a/third_party/blink/renderer/platform/scheduler/common/worker_pool_unittest.cc b/third_party/blink/renderer/platform/scheduler/common/worker_pool_unittest.cc
index 7474aa3..2dc46f9 100644
--- a/third_party/blink/renderer/platform/scheduler/common/worker_pool_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/common/worker_pool_unittest.cc
@@ -21,7 +21,7 @@
} // namespace
TEST(BackgroundSchedulerTest, RunOnBackgroundThread) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
std::unique_ptr<base::WaitableEvent> done_event =
std::make_unique<base::WaitableEvent>();
worker_pool::PostTask(
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc
index 5f5f869..73586ec0 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/deadline_task_runner_unittest.cc
@@ -19,9 +19,8 @@
public:
DeadlineTaskRunnerTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
~DeadlineTaskRunnerTest() override = default;
void SetUp() override {
@@ -38,7 +37,7 @@
void TestTask() { run_times_.push_back(Now()); }
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<DeadlineTaskRunner> deadline_task_runner_;
std::vector<base::TimeTicks> run_times_;
};
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_interference_recorder_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_interference_recorder_unittest.cc
index b7aa797..fcf1908 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_interference_recorder_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_interference_recorder_unittest.cc
@@ -72,12 +72,10 @@
}
void FastForwardBy(base::TimeDelta delta) {
- scoped_task_environment_.FastForwardBy(delta);
+ task_environment_.FastForwardBy(delta);
}
- base::TimeTicks NowTicks() const {
- return scoped_task_environment_.NowTicks();
- }
+ base::TimeTicks NowTicks() const { return task_environment_.NowTicks(); }
void OnTaskReady(FrameScheduler* frame_scheduler,
base::sequence_manager::EnqueueOrder enqueue_order) {
@@ -86,7 +84,7 @@
}
const base::TickClock* GetMockTickClock() const {
- return scoped_task_environment_.GetMockTickClock();
+ return task_environment_.GetMockTickClock();
}
testing::StrictMock<MockFrameInterferenceRecorder> recorder_{this};
@@ -104,8 +102,8 @@
scoped_refptr<MainThreadTaskQueue> queue_no_frame_ =
CreateMainThreadTaskQueue();
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME};
private:
scoped_refptr<MainThreadTaskQueue> CreateMainThreadTaskQueue() {
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
index e654b79e..5c20095 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_scheduler_impl_unittest.cc
@@ -63,9 +63,8 @@
public:
FrameSchedulerImplTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
FrameSchedulerImplTest(std::vector<base::Feature> features_to_enable,
std::vector<base::Feature> features_to_disable)
@@ -226,7 +225,7 @@
base::test::ScopedFeatureList& scoped_feature_list() { return feature_list_; }
base::test::ScopedFeatureList feature_list_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MainThreadSchedulerImpl> scheduler_;
std::unique_ptr<PageSchedulerImpl> page_scheduler_;
std::unique_ptr<FrameSchedulerImpl> frame_scheduler_;
@@ -317,7 +316,7 @@
// Simulate running a task of a particular length by fast forwarding the task
// environment clock, which is used to determine the wall time of a task.
-void RunTaskOfLength(base::test::ScopedTaskEnvironment* task_environment,
+void RunTaskOfLength(base::test::TaskEnvironment* task_environment,
base::TimeDelta length) {
task_environment->FastForwardBy(length);
}
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/frame_task_queue_controller_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/frame_task_queue_controller_unittest.cc
index abc2179..ac37955 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/frame_task_queue_controller_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/frame_task_queue_controller_unittest.cc
@@ -36,8 +36,8 @@
public:
FrameTaskQueueControllerTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
task_queue_created_count_(0) {}
~FrameTaskQueueControllerTest() override = default;
@@ -91,7 +91,7 @@
size_t task_queue_created_count() const { return task_queue_created_count_; }
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MainThreadSchedulerImpl> scheduler_;
std::unique_ptr<PageSchedulerImpl> page_scheduler_;
std::unique_ptr<FrameSchedulerImpl> frame_scheduler_;
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc
index 8ec25e228..1a313a08 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/idle_time_estimator_unittest.cc
@@ -37,8 +37,8 @@
public:
IdleTimeEstimatorTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
frame_length_(base::TimeDelta::FromMilliseconds(16)) {}
~IdleTimeEstimatorTest() override = default;
@@ -87,7 +87,7 @@
task_environment_.FastForwardBy(idle_time);
}
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::sequence_manager::SequenceManager> manager_;
scoped_refptr<base::sequence_manager::TaskQueue> compositor_task_queue_;
std::unique_ptr<IdleTimeEstimatorForTest> estimator_;
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_metrics_helper_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_metrics_helper_unittest.cc
index cd716509..14f4530 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_metrics_helper_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/main_thread_metrics_helper_unittest.cc
@@ -50,9 +50,8 @@
public:
MainThreadMetricsHelperTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::
- QUEUED) {}
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED) {}
~MainThreadMetricsHelperTest() override = default;
@@ -234,7 +233,7 @@
}
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MainThreadSchedulerImplForTest> scheduler_;
MainThreadMetricsHelper* metrics_helper_; // NOT OWNED
std::unique_ptr<base::HistogramTester> histogram_tester_;
diff --git a/third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager_unittest.cc b/third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager_unittest.cc
index 64b813e..7b604df 100644
--- a/third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/main_thread/memory_purge_manager_unittest.cc
@@ -23,11 +23,9 @@
class MemoryPurgeManagerTest : public testing::Test {
public:
MemoryPurgeManagerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME),
- memory_purge_manager_(
- scoped_task_environment_.GetMainThreadTaskRunner()),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI,
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME),
+ memory_purge_manager_(task_environment_.GetMainThreadTaskRunner()),
observed_memory_pressure_(false) {}
void SetUp() override {
@@ -39,7 +37,7 @@
void TearDown() override {
memory_pressure_listener_.reset();
- scoped_task_environment_.FastForwardUntilNoTasksRemain();
+ task_environment_.FastForwardUntilNoTasksRemain();
}
protected:
@@ -65,11 +63,11 @@
}
void FastForwardBy(base::TimeDelta delta) {
- scoped_task_environment_.FastForwardBy(delta);
+ task_environment_.FastForwardBy(delta);
}
base::test::ScopedFeatureList scoped_feature_list_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::MemoryPressureListener> memory_pressure_listener_;
MemoryPurgeManager memory_purge_manager_;
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_proxy_unittest.cc b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_proxy_unittest.cc
index ed49f69..81a66a2 100644
--- a/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_proxy_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/worker/worker_scheduler_proxy_unittest.cc
@@ -103,8 +103,8 @@
public:
WorkerSchedulerProxyTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
main_thread_scheduler_(std::make_unique<MainThreadSchedulerImpl>(
base::sequence_manager::SequenceManagerForTest::Create(
nullptr,
@@ -127,7 +127,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<MainThreadSchedulerImpl> main_thread_scheduler_;
std::unique_ptr<PageSchedulerImpl> page_scheduler_;
std::unique_ptr<FrameSchedulerImpl> frame_scheduler_;
diff --git a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc
index 1b4c4b2..3eafdb9 100644
--- a/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc
+++ b/third_party/blink/renderer/platform/scheduler/worker/worker_thread_scheduler_unittest.cc
@@ -140,8 +140,8 @@
public:
WorkerThreadSchedulerTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
sequence_manager_(
base::sequence_manager::SequenceManagerForTest::Create(
nullptr,
@@ -207,7 +207,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Needs to be initialized immediately after |task_environment_|, specifically
// before |scheduler_|.
ScopedSaveStartTicks save_start_ticks_{task_environment_.NowTicks()};
@@ -427,10 +427,10 @@
base::TimeTicks start_time = task_environment_.NowTicks();
default_task_runner_->PostTask(
- FROM_HERE, WTF::Bind(&base::test::ScopedTaskEnvironment::FastForwardBy,
+ FROM_HERE, WTF::Bind(&base::test::TaskEnvironment::FastForwardBy,
base::Unretained(&task_environment_), kTaskTime));
scheduler_->set_on_microtask_checkpoint(
- WTF::Bind(&base::test::ScopedTaskEnvironment::FastForwardBy,
+ WTF::Bind(&base::test::TaskEnvironment::FastForwardBy,
base::Unretained(&task_environment_), kMicrotaskTime));
RecordingTaskTimeObserver observer;
@@ -474,8 +474,8 @@
public:
WorkerThreadSchedulerWithProxyTest()
: task_environment_(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED),
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED),
sequence_manager_(
base::sequence_manager::SequenceManagerForTest::Create(
nullptr,
@@ -510,7 +510,7 @@
}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::sequence_manager::SequenceManagerForTest>
sequence_manager_;
Vector<String> timeline_;
diff --git a/third_party/blink/renderer/platform/timer_test.cc b/third_party/blink/renderer/platform/timer_test.cc
index 0c6df2ca..25b0d545 100644
--- a/third_party/blink/renderer/platform/timer_test.cc
+++ b/third_party/blink/renderer/platform/timer_test.cc
@@ -84,7 +84,7 @@
platform_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
class OnHeapTimerOwner final
diff --git a/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc b/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc
index e5e7375..0f632dbd 100644
--- a/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc
+++ b/third_party/blink/renderer/platform/video_capture/video_capture_impl_test.cc
@@ -210,7 +210,7 @@
}
const base::UnguessableToken session_id_ = base::UnguessableToken::Create();
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ScopedTestingPlatformSupport<IOTaskRunnerTestingPlatformSupport> platform_;
const std::unique_ptr<VideoCaptureImpl> video_capture_impl_;
MockMojoVideoCaptureHost mock_video_capture_host_;
diff --git a/ui/android/resources/resource_manager_impl_unittest.cc b/ui/android/resources/resource_manager_impl_unittest.cc
index 051aea2..bfe1b66 100644
--- a/ui/android/resources/resource_manager_impl_unittest.cc
+++ b/ui/android/resources/resource_manager_impl_unittest.cc
@@ -113,7 +113,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
WindowAndroid* window_android_;
protected:
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index b7a1ca4..e25d65e6 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -24,8 +24,7 @@
namespace test {
AuraTestBase::AuraTestBase()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
AuraTestBase::~AuraTestBase() {
CHECK(setup_called_)
diff --git a/ui/aura/test/aura_test_base.h b/ui/aura/test/aura_test_base.h
index bcfd970..21b70265 100644
--- a/ui/aura/test/aura_test_base.h
+++ b/ui/aura/test/aura_test_base.h
@@ -66,7 +66,7 @@
client::FocusClient* focus_client() { return helper_->focus_client(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
#if defined(OS_WIN)
base::win::ScopedCOMInitializer com_initializer_;
diff --git a/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc b/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
index c15b5cb..e7c7cbe 100644
--- a/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
+++ b/ui/base/accelerators/global_media_keys_listener_win_interactive_test.cc
@@ -67,8 +67,7 @@
class GlobalMediaKeysListenerWinInteractiveTest : public testing::Test {
public:
GlobalMediaKeysListenerWinInteractiveTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
protected:
void SendKeyDown(KeyboardCode code) {
@@ -90,7 +89,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DWORD time_stamp_ = 0;
DISALLOW_COPY_AND_ASSIGN(GlobalMediaKeysListenerWinInteractiveTest);
@@ -149,4 +148,4 @@
delegate.ExpectReceivedEvent(/*index=*/1, ui::VKEY_MEDIA_STOP);
}
-} // namespace ui
\ No newline at end of file
+} // namespace ui
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index 3c6eb93..d3cc37c 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -15,7 +15,7 @@
namespace {
-base::test::ScopedTaskEnvironment* g_task_environment = nullptr;
+base::test::TaskEnvironment* g_task_environment = nullptr;
} // namespace
@@ -28,8 +28,8 @@
static Clipboard* Create() {
DCHECK(!g_task_environment);
- g_task_environment = new base::test::ScopedTaskEnvironment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ g_task_environment = new base::test::TaskEnvironment(
+ base::test::TaskEnvironment::MainThreadType::UI);
return Clipboard::GetForCurrentThread();
}
diff --git a/ui/base/clipboard/test/test_clipboard_unittest.cc b/ui/base/clipboard/test/test_clipboard_unittest.cc
index 021a85c..1d9d1a3 100644
--- a/ui/base/clipboard/test/test_clipboard_unittest.cc
+++ b/ui/base/clipboard/test/test_clipboard_unittest.cc
@@ -15,7 +15,7 @@
namespace {
-base::test::ScopedTaskEnvironment* g_task_environment = nullptr;
+base::test::TaskEnvironment* g_task_environment = nullptr;
} // namespace
@@ -28,8 +28,8 @@
static Clipboard* Create() {
DCHECK(!g_task_environment);
- g_task_environment = new base::test::ScopedTaskEnvironment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ g_task_environment = new base::test::TaskEnvironment(
+ base::test::TaskEnvironment::MainThreadType::UI);
return TestClipboard::CreateForCurrentThread();
}
diff --git a/ui/base/cocoa/menu_controller_unittest.mm b/ui/base/cocoa/menu_controller_unittest.mm
index c36ba6b..ecc086b 100644
--- a/ui/base/cocoa/menu_controller_unittest.mm
+++ b/ui/base/cocoa/menu_controller_unittest.mm
@@ -377,8 +377,8 @@
// hidden, then the submenu should hide.
TEST_F(MenuControllerTest, HiddenSubmenu) {
// SimpleMenuModel posts a task that calls Delegate::MenuClosed.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
// Create the model.
Delegate delegate;
@@ -424,8 +424,8 @@
TEST_F(MenuControllerTest, DisabledSubmenu) {
// SimpleMenuModel posts a task that calls Delegate::MenuClosed.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
// Create the model.
Delegate delegate;
@@ -619,8 +619,8 @@
TEST_F(MenuControllerTest, OpenClose) {
// SimpleMenuModel posts a task that calls Delegate::MenuClosed.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
// Create the model.
Delegate delegate;
@@ -689,8 +689,8 @@
if (![NSMenuItem instancesRespondToSelector:@selector(_sendItemSelectedNote)])
return;
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
Delegate delegate;
delegate.auto_close_ = false;
@@ -795,8 +795,8 @@
// MenuControllerCocoa and destroys itself. Note this usually needs asan to
// actually crash (before it was fixed).
TEST_F(MenuControllerTest, OwningDelegate) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
bool did_delete = false;
BOOL did_dealloc = NO;
OwningDelegate* delegate;
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc b/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
index ac42a4d..8e47f558 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11_unittest.cc
@@ -24,8 +24,7 @@
class OSExchangeDataProviderAuraX11Test : public testing::Test {
public:
OSExchangeDataProviderAuraX11Test()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
event_source(gfx::GetXDisplay()) {}
void AddURLList(const std::string& list_contents) {
@@ -37,7 +36,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
X11EventSourceGlib event_source;
ui::OSExchangeDataProviderAuraX11 provider;
};
diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc
index 7ee364b..ef69948 100644
--- a/ui/base/dragdrop/os_exchange_data_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -23,12 +23,11 @@
class OSExchangeDataTest : public PlatformTest {
public:
OSExchangeDataTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
event_source_(PlatformEventSource::CreateDefault()) {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<PlatformEventSource> event_source_;
};
diff --git a/ui/base/dragdrop/os_exchange_data_win_unittest.cc b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
index 641bfff..4b751c0 100644
--- a/ui/base/dragdrop/os_exchange_data_win_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_win_unittest.cc
@@ -34,8 +34,7 @@
class OSExchangeDataWinTest : public ::testing::Test {
public:
OSExchangeDataWinTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
void OnGotVirtualFilesAsTempFiles(
const std::vector<std::pair<base::FilePath, base::FilePath>>&
@@ -52,7 +51,7 @@
protected:
std::vector<FileInfo> retrieved_virtual_files_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Test getting using the IDataObject COM API
@@ -381,7 +380,7 @@
EXPECT_TRUE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kTestFilenamesAndContents.size(),
retrieved_virtual_files_.size());
@@ -457,7 +456,7 @@
EXPECT_FALSE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(static_cast<size_t>(0), retrieved_virtual_files_.size());
}
@@ -506,7 +505,7 @@
EXPECT_TRUE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kTestFilenamesAndContents.size(), file_infos.size());
for (size_t i = 0; i < retrieved_virtual_files_.size(); i++) {
@@ -589,7 +588,7 @@
EXPECT_TRUE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kTestFilenamesAndContents.size(), file_infos.size());
for (size_t i = 0; i < retrieved_virtual_files_.size(); i++) {
@@ -700,7 +699,7 @@
EXPECT_TRUE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kTestFilenamesAndContents.size(), file_infos.size());
for (size_t i = 0; i < retrieved_virtual_files_.size(); i++) {
@@ -785,7 +784,7 @@
EXPECT_TRUE(copy.GetVirtualFilesAsTempFiles(std::move(callback)));
// RunUntilIdle assures all async tasks are run.
- scoped_task_environment_.RunUntilIdle();
+ task_environment_.RunUntilIdle();
EXPECT_EQ(kTestFilenamesAndContents.size(),
retrieved_virtual_files_.size());
diff --git a/ui/base/ime/chromeos/input_method_chromeos_unittest.cc b/ui/base/ime/chromeos/input_method_chromeos_unittest.cc
index f1ff1de..ebf1e6c3 100644
--- a/ui/base/ime/chromeos/input_method_chromeos_unittest.cc
+++ b/ui/base/ime/chromeos/input_method_chromeos_unittest.cc
@@ -366,7 +366,7 @@
TestInputMethodManager* input_method_manager_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(InputMethodChromeOSTest);
};
diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc
index 157da3b..217c977c 100644
--- a/ui/base/ime/input_method_base_unittest.cc
+++ b/ui/base/ime/input_method_base_unittest.cc
@@ -111,8 +111,8 @@
class InputMethodBaseTest : public testing::Test {
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
};
class MockInputMethodBase : public InputMethodBase {
diff --git a/ui/base/ime/mojom/ime_mojom_traits_unittest.cc b/ui/base/ime/mojom/ime_mojom_traits_unittest.cc
index 2bbc9875..67dc9de 100644
--- a/ui/base/ime/mojom/ime_mojom_traits_unittest.cc
+++ b/ui/base/ime/mojom/ime_mojom_traits_unittest.cc
@@ -35,9 +35,8 @@
std::move(callback).Run(in);
}
- base::test::ScopedTaskEnvironment
- scoped_task_environment_; // A MessageLoop is needed for Mojo IPC to
- // work.
+ base::test::TaskEnvironment task_environment_; // A MessageLoop is needed for
+ // Mojo IPC to work.
mojo::BindingSet<mojom::IMEStructTraitsTest> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(IMEStructTraitsTest);
diff --git a/ui/base/ime/win/on_screen_keyboard_display_manager_unittest.cc b/ui/base/ime/win/on_screen_keyboard_display_manager_unittest.cc
index 3887fb1..997f4f9 100644
--- a/ui/base/ime/win/on_screen_keyboard_display_manager_unittest.cc
+++ b/ui/base/ime/win/on_screen_keyboard_display_manager_unittest.cc
@@ -108,8 +108,7 @@
class OnScreenKeyboardTest : public ::testing::Test {
protected:
OnScreenKeyboardTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
std::unique_ptr<OnScreenKeyboardDisplayManagerTabTip> CreateTabTip() {
return std::unique_ptr<OnScreenKeyboardDisplayManagerTabTip>(
@@ -123,14 +122,14 @@
void WaitForEventsWithTimeDelay(int64_t time_delta_ms = 10) {
base::RunLoop run_loop;
- scoped_task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
+ task_environment_.GetMainThreadTaskRunner()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(time_delta_ms));
run_loop.Run();
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(OnScreenKeyboardTest);
};
diff --git a/ui/base/mpris/mpris_service_impl_unittest.cc b/ui/base/mpris/mpris_service_impl_unittest.cc
index 5ee9b87..aecd2d5 100644
--- a/ui/base/mpris/mpris_service_impl_unittest.cc
+++ b/ui/base/mpris/mpris_service_impl_unittest.cc
@@ -51,8 +51,7 @@
class MprisServiceImplTest : public testing::Test, public MprisServiceObserver {
public:
MprisServiceImplTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~MprisServiceImplTest() override = default;
void SetUp() override { StartMprisServiceAndWaitForReady(); }
@@ -153,7 +152,7 @@
service_wait_loop_->Quit();
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<base::RunLoop> service_wait_loop_;
std::unique_ptr<base::RunLoop> response_wait_loop_;
std::unique_ptr<MprisServiceImpl> service_;
diff --git a/ui/base/test/scoped_fake_nswindow_fullscreen_unittest.mm b/ui/base/test/scoped_fake_nswindow_fullscreen_unittest.mm
index c848882..a2a92ede 100644
--- a/ui/base/test/scoped_fake_nswindow_fullscreen_unittest.mm
+++ b/ui/base/test/scoped_fake_nswindow_fullscreen_unittest.mm
@@ -41,8 +41,8 @@
// Test the order of notifications sent when faking fullscreen transitions.
TEST(ScopedFakeNSWindowFullscreenTest, TestOrdering) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask |
NSClosableWindowMask | NSMiniaturizableWindowMask |
diff --git a/ui/base/x/selection_requestor_unittest.cc b/ui/base/x/selection_requestor_unittest.cc
index 2954b66..2902e8c 100644
--- a/ui/base/x/selection_requestor_unittest.cc
+++ b/ui/base/x/selection_requestor_unittest.cc
@@ -89,8 +89,8 @@
std::unique_ptr<PlatformEventSource> event_source_;
std::unique_ptr<SelectionRequestor> requestor_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
private:
DISALLOW_COPY_AND_ASSIGN(SelectionRequestorTest);
diff --git a/ui/compositor/compositor_unittest.cc b/ui/compositor/compositor_unittest.cc
index f963db85..5ae602f 100644
--- a/ui/compositor/compositor_unittest.cc
+++ b/ui/compositor/compositor_unittest.cc
@@ -82,8 +82,7 @@
class CompositorTestWithMessageLoop : public CompositorTest {
public:
CompositorTestWithMessageLoop()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~CompositorTestWithMessageLoop() override = default;
protected:
@@ -95,7 +94,7 @@
base::SequencedTaskRunner* task_runner() { return task_runner_.get(); }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
};
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
index 8337c4ae..de080ec 100644
--- a/ui/compositor/layer_animator_unittest.cc
+++ b/ui/compositor/layer_animator_unittest.cc
@@ -3253,8 +3253,8 @@
}
TEST(LayerAnimatorTest, LayerMovedBetweenCompositorsDuringAnimation) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::UI);
const bool enable_pixel_output = false;
TestContextFactories context_factories(enable_pixel_output);
const gfx::Rect bounds(10, 10, 100, 100);
@@ -3317,8 +3317,8 @@
}
TEST(LayerAnimatorTest, ThreadedAnimationSurvivesIfLayerRemovedAdded) {
- base::test::ScopedTaskEnvironment scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment_(
+ base::test::TaskEnvironment::MainThreadType::UI);
const bool enable_pixel_output = false;
TestContextFactories context_factories(enable_pixel_output);
const gfx::Rect bounds(10, 10, 100, 100);
diff --git a/ui/compositor/layer_unittest.cc b/ui/compositor/layer_unittest.cc
index 6e464c5..dbeec073 100644
--- a/ui/compositor/layer_unittest.cc
+++ b/ui/compositor/layer_unittest.cc
@@ -141,8 +141,7 @@
class LayerWithRealCompositorTest : public testing::TestWithParam<bool> {
public:
LayerWithRealCompositorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
gfx::FontList::SetDefaultFontDescription("Segoe UI, 15px");
}
~LayerWithRealCompositorTest() override {}
@@ -285,7 +284,7 @@
std::unique_ptr<base::RunLoop> run_loop_;
};
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestContextFactories> context_factories_;
std::unique_ptr<TestCompositorHost> compositor_host_;
@@ -515,8 +514,7 @@
class LayerWithDelegateTest : public testing::Test {
public:
LayerWithDelegateTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~LayerWithDelegateTest() override {}
// Overridden from testing::Test:
@@ -582,7 +580,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<TestContextFactories> context_factories_;
std::unique_ptr<TestCompositorHost> compositor_host_;
diff --git a/ui/display/manager/configure_displays_task_unittest.cc b/ui/display/manager/configure_displays_task_unittest.cc
index b89205ce..1f4aabe 100644
--- a/ui/display/manager/configure_displays_task_unittest.cc
+++ b/ui/display/manager/configure_displays_task_unittest.cc
@@ -48,7 +48,7 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
ActionLogger log_;
TestNativeDisplayDelegate delegate_;
diff --git a/ui/display/manager/display_configurator_unittest.cc b/ui/display/manager/display_configurator_unittest.cc
index 474b267..6b5a70f 100644
--- a/ui/display/manager/display_configurator_unittest.cc
+++ b/ui/display/manager/display_configurator_unittest.cc
@@ -312,7 +312,7 @@
return result;
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestStateController state_controller_;
TestMirroringController mirroring_controller_;
DisplayConfigurator configurator_;
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc
index c062dfa0..9f531521 100644
--- a/ui/events/blink/input_handler_proxy_unittest.cc
+++ b/ui/events/blink/input_handler_proxy_unittest.cc
@@ -517,7 +517,7 @@
uint64_t next_begin_frame_number_ = viz::BeginFrameArgs::kStartingFrameNumber;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::WeakPtrFactory<InputHandlerProxyEventQueueTest> weak_ptr_factory_{this};
};
diff --git a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc b/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
index da9d317..50650a7d 100644
--- a/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/filtered_gesture_provider_unittest.cc
@@ -13,8 +13,7 @@
public testing::Test {
public:
FilteredGestureProviderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~FilteredGestureProviderTest() override {}
// GestureProviderClient implementation.
@@ -22,7 +21,7 @@
bool RequiresDoubleTapGestureEvents() const override { return false; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Single touch drag test: After touch-start, the moved_beyond_slop_region bit
diff --git a/ui/events/gesture_detection/gesture_provider_unittest.cc b/ui/events/gesture_detection/gesture_provider_unittest.cc
index 3451986..6c74af3 100644
--- a/ui/events/gesture_detection/gesture_provider_unittest.cc
+++ b/ui/events/gesture_detection/gesture_provider_unittest.cc
@@ -66,8 +66,7 @@
class GestureProviderTest : public testing::Test, public GestureProviderClient {
public:
GestureProviderTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~GestureProviderTest() override {}
static MockMotionEvent ObtainMotionEvent(base::TimeTicks event_time,
@@ -438,7 +437,7 @@
std::vector<GestureEventData> gestures_;
std::unique_ptr<GestureProvider> gesture_provider_;
std::unique_ptr<GestureEventData> active_scroll_begin_event_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
bool should_process_double_tap_events_ = true;
};
diff --git a/ui/events/gestures/gesture_provider_aura_unittest.cc b/ui/events/gestures/gesture_provider_aura_unittest.cc
index 256cf27..d10aa3c 100644
--- a/ui/events/gestures/gesture_provider_aura_unittest.cc
+++ b/ui/events/gestures/gesture_provider_aura_unittest.cc
@@ -17,8 +17,7 @@
public GestureProviderAuraClient {
public:
GestureProviderAuraTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
~GestureProviderAuraTest() override {}
@@ -37,7 +36,7 @@
private:
std::unique_ptr<GestureConsumer> consumer_;
std::unique_ptr<GestureProviderAura> provider_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
TEST_F(GestureProviderAuraTest, IgnoresExtraPressEvents) {
diff --git a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
index a123285..aef0568 100644
--- a/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
+++ b/ui/events/ozone/evdev/event_converter_evdev_impl_unittest.cc
@@ -128,8 +128,8 @@
dispatched_events_.push_back(std::move(cloned_event));
}
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<ui::FakeCursorDelegateEvdev> cursor_;
std::unique_ptr<ui::DeviceManager> device_manager_;
std::unique_ptr<ui::EventFactoryEvdev> event_factory_;
diff --git a/ui/events/ozone/evdev/input_injector_evdev_unittest.cc b/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
index 5821aea..87a092b8 100644
--- a/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/input_injector_evdev_unittest.cc
@@ -88,7 +88,7 @@
InputInjectorEvdev injector_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
private:
diff --git a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
index f480391..1805dde6 100644
--- a/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
+++ b/ui/events/ozone/evdev/touch_event_converter_evdev_unittest.cc
@@ -304,8 +304,8 @@
base::HistogramTester histogram_tester_;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
std::unique_ptr<ui::MockTouchEventConverterEvdev> device_;
std::unique_ptr<ui::MockDeviceEventDispatcherEvdev> dispatcher_;
std::unique_ptr<ui::test::ScopedEventTestTickClock> test_clock_;
diff --git a/ui/events/platform/platform_event_source_unittest.cc b/ui/events/platform/platform_event_source_unittest.cc
index 3be3623..9ed5aea 100644
--- a/ui/events/platform/platform_event_source_unittest.cc
+++ b/ui/events/platform/platform_event_source_unittest.cc
@@ -498,7 +498,7 @@
~PlatformEventTestWithMessageLoop() override {}
void Run() {
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE,
base::BindOnce(&PlatformEventTestWithMessageLoop::RunTestImpl,
base::Unretained(this)));
@@ -509,8 +509,8 @@
virtual void RunTestImpl() = 0;
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
DISALLOW_COPY_AND_ASSIGN(PlatformEventTestWithMessageLoop);
};
diff --git a/ui/events/win/media_keyboard_hook_win_interactive_test.cc b/ui/events/win/media_keyboard_hook_win_interactive_test.cc
index 18a2df9..f15322ae 100644
--- a/ui/events/win/media_keyboard_hook_win_interactive_test.cc
+++ b/ui/events/win/media_keyboard_hook_win_interactive_test.cc
@@ -15,8 +15,7 @@
class MediaKeyboardHookWinInteractiveTest : public testing::Test {
public:
MediaKeyboardHookWinInteractiveTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
protected:
void SetUp() override {
@@ -81,7 +80,7 @@
std::vector<KeyEvent> key_events_;
std::unique_ptr<KeyboardHook> keyboard_hook_;
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop key_event_wait_loop_;
uint32_t num_key_events_to_wait_for_ = 0;
DWORD time_stamp_ = 0;
@@ -117,4 +116,4 @@
ExpectReceivedEvent(/*index=*/1, ui::VKEY_MEDIA_PLAY_PAUSE, ET_KEY_RELEASED);
}
-} // namespace ui
\ No newline at end of file
+} // namespace ui
diff --git a/ui/gfx/animation/animation_container_unittest.cc b/ui/gfx/animation/animation_container_unittest.cc
index 6213e98..60934c8 100644
--- a/ui/gfx/animation/animation_container_unittest.cc
+++ b/ui/gfx/animation/animation_container_unittest.cc
@@ -62,11 +62,10 @@
class AnimationContainerTest: public testing::Test {
protected:
AnimationContainerTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Makes sure the animation ups the ref count of the container and releases it
diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc
index 8658d56..7676738a 100644
--- a/ui/gfx/animation/animation_unittest.cc
+++ b/ui/gfx/animation/animation_unittest.cc
@@ -19,11 +19,10 @@
class AnimationTest: public testing::Test {
protected:
AnimationTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {}
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
namespace {
diff --git a/ui/gfx/animation/slide_animation_unittest.cc b/ui/gfx/animation/slide_animation_unittest.cc
index bd6c66e..bd66a15 100644
--- a/ui/gfx/animation/slide_animation_unittest.cc
+++ b/ui/gfx/animation/slide_animation_unittest.cc
@@ -30,14 +30,13 @@
protected:
SlideAnimationTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
slide_animation_.reset(new SlideAnimation(nullptr));
animation_api_.reset(new AnimationTestApi(slide_animation_.get()));
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
};
// Tests animation construction.
diff --git a/ui/gfx/font_fallback_win_unittest.cc b/ui/gfx/font_fallback_win_unittest.cc
index 77a3bda..a098b9f 100644
--- a/ui/gfx/font_fallback_win_unittest.cc
+++ b/ui/gfx/font_fallback_win_unittest.cc
@@ -36,8 +36,8 @@
private:
// Needed to bypass DCHECK in GetFallbackFont.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
DISALLOW_COPY_AND_ASSIGN(FontFallbackWinTest);
};
@@ -125,8 +125,8 @@
private:
// Needed to bypass DCHECK in GetFallbackFont.
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
DISALLOW_COPY_AND_ASSIGN(GetFallbackFontTest);
};
diff --git a/ui/gfx/geometry/mojom/geometry_mojom_traits_unittest.cc b/ui/gfx/geometry/mojom/geometry_mojom_traits_unittest.cc
index 363cf31..c1f0ee1 100644
--- a/ui/gfx/geometry/mojom/geometry_mojom_traits_unittest.cc
+++ b/ui/gfx/geometry/mojom/geometry_mojom_traits_unittest.cc
@@ -84,7 +84,7 @@
std::move(callback).Run(q);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<GeometryTraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(GeometryStructTraitsTest);
diff --git a/ui/gfx/image/mojom/image_traits_unittest.cc b/ui/gfx/image/mojom/image_traits_unittest.cc
index 12172ce..b44340a 100644
--- a/ui/gfx/image/mojom/image_traits_unittest.cc
+++ b/ui/gfx/image/mojom/image_traits_unittest.cc
@@ -63,7 +63,7 @@
std::move(callback).Run(in);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<ImageTraitsTestService> bindings_;
mojom::ImageTraitsTestServicePtr service_;
diff --git a/ui/gfx/mojom/mojom_traits_unittest.cc b/ui/gfx/mojom/mojom_traits_unittest.cc
index ada3dca6..d1366f0 100644
--- a/ui/gfx/mojom/mojom_traits_unittest.cc
+++ b/ui/gfx/mojom/mojom_traits_unittest.cc
@@ -64,7 +64,7 @@
std::move(callback).Run(r);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
diff --git a/ui/gfx/range/mojom/range_mojom_traits_unittest.cc b/ui/gfx/range/mojom/range_mojom_traits_unittest.cc
index c121711..e55fdf8 100644
--- a/ui/gfx/range/mojom/range_mojom_traits_unittest.cc
+++ b/ui/gfx/range/mojom/range_mojom_traits_unittest.cc
@@ -35,7 +35,7 @@
std::move(callback).Run(p);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<RangeTraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(RangeStructTraitsTest);
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 4158ce5..52f01fd 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -362,8 +362,7 @@
class RenderTextTest : public testing::Test {
public:
RenderTextTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
render_text_(std::make_unique<RenderTextHarfBuzz>()),
test_api_(new test::RenderTextTestApi(render_text_.get())),
renderer_(canvas()) {}
@@ -536,7 +535,7 @@
private:
// Needed to bypass DCHECK in GetFallbackFont.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::unique_ptr<RenderTextHarfBuzz> render_text_;
std::unique_ptr<test::RenderTextTestApi> test_api_;
diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc
index 655c7d1..d2ad1ef 100644
--- a/ui/gfx/text_elider_unittest.cc
+++ b/ui/gfx/text_elider_unittest.cc
@@ -294,8 +294,8 @@
TEST(TextEliderTest, ElideTextAtomicSequences) {
#if defined(OS_WIN)
// Needed to bypass DCHECK in GetFallbackFont.
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
#endif
const FontList font_list;
// The below is 'MUSICAL SYMBOL G CLEF' (U+1D11E), which is represented in
diff --git a/ui/gl/test/run_all_unittests.cc b/ui/gl/test/run_all_unittests.cc
index 46bc39e..36444bc 100644
--- a/ui/gl/test/run_all_unittests.cc
+++ b/ui/gl/test/run_all_unittests.cc
@@ -33,13 +33,12 @@
#if defined(OS_MACOSX) && !defined(OS_IOS)
// This registers a custom NSApplication. It must be done before
- // ScopedTaskEnvironment registers a regular NSApplication.
+ // TaskEnvironment registers a regular NSApplication.
mock_cr_app::RegisterMockCrApp();
#endif
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
#if defined(USE_OZONE)
// Make Ozone run in single-process mode, where it doesn't expect a GPU
@@ -50,7 +49,7 @@
params.single_process = true;
params.using_mojo = true;
- // This initialization must be done after ScopedTaskEnvironment has
+ // This initialization must be done after TaskEnvironment has
// initialized the UI thread.
ui::OzonePlatform::InitializeForUI(params);
#endif
@@ -61,7 +60,7 @@
}
private:
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
DISALLOW_COPY_AND_ASSIGN(GlTestSuite);
};
diff --git a/ui/latency/mojom/mojom_traits_unittest.cc b/ui/latency/mojom/mojom_traits_unittest.cc
index 7d03368..7edc5f36 100644
--- a/ui/latency/mojom/mojom_traits_unittest.cc
+++ b/ui/latency/mojom/mojom_traits_unittest.cc
@@ -32,7 +32,7 @@
std::move(callback).Run(info);
}
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
mojo::BindingSet<TraitsTestService> traits_test_bindings_;
DISALLOW_COPY_AND_ASSIGN(StructTraitsTest);
};
diff --git a/ui/message_center/views/notification_header_view_unittest.cc b/ui/message_center/views/notification_header_view_unittest.cc
index b11a61b..a0131db 100644
--- a/ui/message_center/views/notification_header_view_unittest.cc
+++ b/ui/message_center/views/notification_header_view_unittest.cc
@@ -17,7 +17,7 @@
public:
NotificationHeaderViewTest()
: views::ViewsTestBase(
- base::test::ScopedTaskEnvironment::TimeSource::MOCK_TIME) {}
+ base::test::TaskEnvironment::TimeSource::MOCK_TIME) {}
~NotificationHeaderViewTest() override = default;
// ViewsTestBase:
@@ -60,22 +60,22 @@
IDS_MESSAGE_NOTIFICATION_DURATION_HOURS_SHORTEST_FUTURE, 3),
notification_header_view_->timestamp_for_testing());
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromHours(3));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromHours(3));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(l10n_util::GetPluralStringFUTF16(
IDS_MESSAGE_NOTIFICATION_DURATION_MINUTES_SHORTEST_FUTURE, 30),
notification_header_view_->timestamp_for_testing());
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(30));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromMinutes(30));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(
l10n_util::GetStringUTF16(IDS_MESSAGE_NOTIFICATION_NOW_STRING_SHORTEST),
notification_header_view_->timestamp_for_testing());
- scoped_task_environment_->FastForwardBy(base::TimeDelta::FromDays(2));
- scoped_task_environment_->RunUntilIdle();
+ task_environment_->FastForwardBy(base::TimeDelta::FromDays(2));
+ task_environment_->RunUntilIdle();
EXPECT_EQ(l10n_util::GetPluralStringFUTF16(
IDS_MESSAGE_NOTIFICATION_DURATION_DAYS_SHORTEST, 2),
diff --git a/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc b/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
index 97c5d14..edc0c880 100644
--- a/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_overlay_validator_unittest.cc
@@ -87,8 +87,8 @@
void InitializeDrmState(const std::vector<CrtcState>& crtc_states);
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
scoped_refptr<ui::MockDrmDevice> drm_;
ui::MockGbmDevice* gbm_ = nullptr;
std::unique_ptr<ui::ScreenManager> screen_manager_;
diff --git a/ui/ozone/platform/drm/gpu/drm_thread_unittest.cc b/ui/ozone/platform/drm/gpu/drm_thread_unittest.cc
index a1e2611..3c2c087 100644
--- a/ui/ozone/platform/drm/gpu/drm_thread_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_thread_unittest.cc
@@ -75,7 +75,7 @@
drm_device_ptr_->AddGraphicsDevice(file_path, std::move(file));
}
- base::test::ScopedTaskEnvironment env_;
+ base::test::TaskEnvironment env_;
DrmThread drm_thread_;
ozone::mojom::DrmDevicePtr drm_device_ptr_;
};
diff --git a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
index 2a725b3..c93d2c4 100644
--- a/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/drm_window_unittest.cc
@@ -84,8 +84,8 @@
}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
scoped_refptr<ui::MockDrmDevice> drm_;
std::unique_ptr<ui::ScreenManager> screen_manager_;
std::unique_ptr<ui::DrmDeviceManager> drm_device_manager_;
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
index d9beab5..fe58d9f 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_plane_manager_unittest.cc
@@ -868,9 +868,9 @@
scoped_refptr<ui::MockDrmDevice> fake_drm_;
std::unique_ptr<ui::HardwareDisplayPlaneManager> plane_manager_;
bool callback_called = false;
- base::test::ScopedTaskEnvironment task_env_{
- base::test::ScopedTaskEnvironment::MainThreadType::DEFAULT,
- base::test::ScopedTaskEnvironment::ThreadPoolExecutionMode::QUEUED};
+ base::test::TaskEnvironment task_env_{
+ base::test::TaskEnvironment::MainThreadType::DEFAULT,
+ base::test::TaskEnvironment::ThreadPoolExecutionMode::QUEUED};
scoped_refptr<ui::DrmFramebuffer> drm_framebuffer_;
const FakeFenceFD fake_fence_fd1_;
const FakeFenceFD fake_fence_fd2_;
diff --git a/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc b/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc
index d8b077e..325f2e4 100644
--- a/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/proxy_helpers_unittest.cc
@@ -32,7 +32,7 @@
void QuitFunction(int a) {
EXPECT_TRUE(drm_checker_.CalledOnValidThread());
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(
+ task_environment_.GetMainThreadTaskRunner()->PostTask(
FROM_HERE, base::BindOnce(&ProxyHelpersTest::QuitFunctionCallback,
base::Unretained(this), 8));
}
@@ -42,8 +42,7 @@
EXPECT_TRUE(main_checker_.CalledOnValidThread());
auto quitter = run_loop_.QuitWhenIdleClosure();
- scoped_task_environment_.GetMainThreadTaskRunner()->PostTask(FROM_HERE,
- quitter);
+ task_environment_.GetMainThreadTaskRunner()->PostTask(FROM_HERE, quitter);
}
void SetDrmChecker() { drm_checker_.DetachFromThread(); }
@@ -91,7 +90,7 @@
protected:
// Main thread message loop.
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
base::RunLoop run_loop_;
// Thread to simulate the drm thread in ozone viz process.
diff --git a/ui/ozone/platform/wayland/host/wayland_connection_unittest.cc b/ui/ozone/platform/wayland/host/wayland_connection_unittest.cc
index 61080566..983023c 100644
--- a/ui/ozone/platform/wayland/host/wayland_connection_unittest.cc
+++ b/ui/ozone/platform/wayland/host/wayland_connection_unittest.cc
@@ -18,8 +18,8 @@
}
TEST(WaylandConnectionTest, UseUnstableVersion) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
wl::TestWaylandServerThread server;
EXPECT_CALL(*server.xdg_shell(),
UseUnstableVersion(XDG_SHELL_VERSION_CURRENT));
@@ -33,8 +33,8 @@
}
TEST(WaylandConnectionTest, Ping) {
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
wl::TestWaylandServerThread server;
ASSERT_TRUE(server.Start(kXdgVersion5));
WaylandConnection connection;
diff --git a/ui/ozone/platform/wayland/test/wayland_test.cc b/ui/ozone/platform/wayland/test/wayland_test.cc
index 1da8b15..2df04017 100644
--- a/ui/ozone/platform/wayland/test/wayland_test.cc
+++ b/ui/ozone/platform/wayland/test/wayland_test.cc
@@ -23,8 +23,7 @@
namespace ui {
WaylandTest::WaylandTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI) {
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI) {
#if BUILDFLAG(USE_XKBCOMMON)
KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
std::make_unique<XkbKeyboardLayoutEngine>(xkb_evdev_code_converter_));
diff --git a/ui/ozone/platform/wayland/test/wayland_test.h b/ui/ozone/platform/wayland/test/wayland_test.h
index 85a095df..e0e30ea 100644
--- a/ui/ozone/platform/wayland/test/wayland_test.h
+++ b/ui/ozone/platform/wayland/test/wayland_test.h
@@ -46,7 +46,7 @@
void Sync();
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
wl::TestWaylandServerThread server_;
wl::MockSurface* surface_;
diff --git a/ui/ozone/platform/x11/x11_screen_ozone_unittest.cc b/ui/ozone/platform/x11/x11_screen_ozone_unittest.cc
index ca45b913..694402d7b 100644
--- a/ui/ozone/platform/x11/x11_screen_ozone_unittest.cc
+++ b/ui/ozone/platform/x11/x11_screen_ozone_unittest.cc
@@ -50,8 +50,8 @@
class X11ScreenOzoneTest : public testing::Test {
public:
X11ScreenOzoneTest()
- : task_env_(std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI)) {}
+ : task_env_(std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI)) {}
~X11ScreenOzoneTest() override = default;
void SetUp() override {
@@ -114,7 +114,7 @@
std::unique_ptr<display::Display> primary_display_;
std::unique_ptr<X11ScreenOzone> screen_;
std::unique_ptr<X11EventSourceDefault> event_source_;
- std::unique_ptr<base::test::ScopedTaskEnvironment> task_env_;
+ std::unique_ptr<base::test::TaskEnvironment> task_env_;
DISALLOW_COPY_AND_ASSIGN(X11ScreenOzoneTest);
};
diff --git a/ui/ozone/platform/x11/x11_window_ozone_unittest.cc b/ui/ozone/platform/x11/x11_window_ozone_unittest.cc
index d2e19ef3..3018631 100644
--- a/ui/ozone/platform/x11/x11_window_ozone_unittest.cc
+++ b/ui/ozone/platform/x11/x11_window_ozone_unittest.cc
@@ -40,8 +40,8 @@
class X11WindowOzoneTest : public testing::Test {
public:
X11WindowOzoneTest()
- : task_env_(std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI)) {}
+ : task_env_(std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI)) {}
~X11WindowOzoneTest() override = default;
@@ -79,7 +79,7 @@
}
private:
- std::unique_ptr<base::test::ScopedTaskEnvironment> task_env_;
+ std::unique_ptr<base::test::TaskEnvironment> task_env_;
std::unique_ptr<X11WindowManagerOzone> window_manager_;
std::unique_ptr<X11EventSourceDefault> event_source_;
diff --git a/ui/shell_dialogs/select_file_dialog_mac_unittest.mm b/ui/shell_dialogs/select_file_dialog_mac_unittest.mm
index e3185db..41ce840c 100644
--- a/ui/shell_dialogs/select_file_dialog_mac_unittest.mm
+++ b/ui/shell_dialogs/select_file_dialog_mac_unittest.mm
@@ -93,7 +93,7 @@
void* params) override {}
protected:
- base::test::ScopedTaskEnvironment task_environment_;
+ base::test::TaskEnvironment task_environment_;
// Helper method to launch a dialog with the given |args|.
void SelectFileWithParams(FileDialogArguments args) {
diff --git a/ui/shell_dialogs/select_file_dialog_win_unittest.cc b/ui/shell_dialogs/select_file_dialog_win_unittest.cc
index 2f8d4f3..f7621b5 100644
--- a/ui/shell_dialogs/select_file_dialog_win_unittest.cc
+++ b/ui/shell_dialogs/select_file_dialog_win_unittest.cc
@@ -147,7 +147,7 @@
void FileSelectionCanceled(void* params) override { was_cancelled_ = true; }
// Runs the scheduler until no tasks are executing anymore.
- void RunUntilIdle() { scoped_task_environment_.RunUntilIdle(); }
+ void RunUntilIdle() { task_environment_.RunUntilIdle(); }
const std::vector<base::FilePath>& selected_paths() {
return selected_paths_;
@@ -169,7 +169,7 @@
}
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
std::vector<base::FilePath> selected_paths_;
bool was_cancelled_ = false;
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc
index d7b9131..7f0f9a3 100644
--- a/ui/snapshot/snapshot_aura_unittest.cc
+++ b/ui/snapshot/snapshot_aura_unittest.cc
@@ -99,9 +99,8 @@
void SetUp() override {
testing::Test::SetUp();
- scoped_task_environment_ =
- std::make_unique<base::test::ScopedTaskEnvironment>(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ task_environment_ = std::make_unique<base::test::TaskEnvironment>(
+ base::test::TaskEnvironment::MainThreadType::UI);
// The ContextFactory must exist before any Compositors are created.
// Snapshot test tests real drawing and readback, so needs pixel output.
@@ -121,7 +120,7 @@
helper_->RunAllPendingInMessageLoop();
helper_->TearDown();
context_factories_.reset();
- scoped_task_environment_.reset();
+ task_environment_.reset();
testing::Test::TearDown();
}
@@ -182,7 +181,7 @@
bool completed_;
};
- std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ std::unique_ptr<base::test::TaskEnvironment> task_environment_;
std::unique_ptr<ui::TestContextFactories> context_factories_;
std::unique_ptr<aura::test::AuraTestHelper> helper_;
std::unique_ptr<aura::Window> test_window_;
diff --git a/ui/views/animation/bounds_animator_unittest.cc b/ui/views/animation/bounds_animator_unittest.cc
index 896cf5c..f55ec5b 100644
--- a/ui/views/animation/bounds_animator_unittest.cc
+++ b/ui/views/animation/bounds_animator_unittest.cc
@@ -77,8 +77,7 @@
class BoundsAnimatorTest : public testing::Test {
public:
BoundsAnimatorTest()
- : scoped_task_environment_(
- base::test::ScopedTaskEnvironment::MainThreadType::UI),
+ : task_environment_(base::test::TaskEnvironment::MainThreadType::UI),
child_(new TestView()),
animator_(&parent_) {
parent_.AddChildView(child_);
@@ -90,7 +89,7 @@
BoundsAnimator* animator() { return &animator_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
TestView parent_;
TestView* child_; // Owned by |parent_|.
BoundsAnimator animator_;
diff --git a/ui/views/animation/installable_ink_drop_animator_unittest.cc b/ui/views/animation/installable_ink_drop_animator_unittest.cc
index 09ab889e..3d86498 100644
--- a/ui/views/animation/installable_ink_drop_animator_unittest.cc
+++ b/ui/views/animation/installable_ink_drop_animator_unittest.cc
@@ -32,7 +32,7 @@
&callback_called_)) {}
protected:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
scoped_refptr<gfx::AnimationContainer> animation_container_;
gfx::AnimationContainerTestApi animation_tester_;
diff --git a/ui/views/animation/installable_ink_drop_unittest.cc b/ui/views/animation/installable_ink_drop_unittest.cc
index b6d27e2e..26dad7d 100644
--- a/ui/views/animation/installable_ink_drop_unittest.cc
+++ b/ui/views/animation/installable_ink_drop_unittest.cc
@@ -27,7 +27,7 @@
View* root_view() { return &root_view_; }
private:
- base::test::ScopedTaskEnvironment scoped_task_environment_;
+ base::test::TaskEnvironment task_environment_;
View root_view_;
};
diff --git a/ui/views/cocoa/bridged_native_widget_unittest.mm b/ui/views/cocoa/bridged_native_widget_unittest.mm
index ebe176a..4e0adda 100644
--- a/ui/views/cocoa/bridged_native_widget_unittest.mm
+++ b/ui/views/cocoa/bridged_native_widget_unittest.mm
@@ -511,8 +511,8 @@
HandleKeyEventCallback handle_key_event_callback_;
- base::test::ScopedTaskEnvironment scoped_task_environment_{
- base::test::ScopedTaskEnvironment::MainThreadType::UI};
+ base::test::TaskEnvironment task_environment_{
+ base::test::TaskEnvironment::MainThreadType::UI};
private:
DISALLOW_COPY_AND_ASSIGN(BridgedNativeWidgetTest);
diff --git a/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc b/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc
index ef40b47..055bac6 100644
--- a/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc
+++ b/ui/views/controls/menu/menu_closure_animation_mac_unittest.cc
@@ -11,7 +11,7 @@
TEST(MenuClosureAnimationMacTest, DestructCancelsCleanly) {
views::test::DisableMenuClosureAnimations();
- base::test::ScopedTaskEnvironment environment;
+ base::test::TaskEnvironment environment;
bool called = false;
auto animation = std::make_unique<views::MenuClosureAnimationMac>(
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 65ba7c8..797ed8f 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -79,7 +79,7 @@
gl::init::InitializeGLOneOff();
- // The use of base::test::ScopedTaskEnvironment below relies on the timeout
+ // The use of base::test::TaskEnvironment below relies on the timeout
// values from TestTimeouts. This ensures they're properly initialized.
TestTimeouts::Initialize();
@@ -93,8 +93,8 @@
&host_frame_sink_manager, &frame_sink_manager);
context_factory->set_use_test_surface(false);
- base::test::ScopedTaskEnvironment scoped_task_environment(
- base::test::ScopedTaskEnvironment::MainThreadType::UI);
+ base::test::TaskEnvironment task_environment(
+ base::test::TaskEnvironment::MainThreadType::UI);
base::i18n::InitializeICU();
diff --git a/ui/views/test/views_test_base.cc b/ui/views/test/views_test_base.cc
index e5d1e81..f31b2e0 100644
--- a/ui/views/test/views_test_base.cc
+++ b/ui/views/test/views_test_base.cc
@@ -65,7 +65,7 @@
ViewsTestBase::ViewsTestBase(
ViewsTestBase::SubclassManagesTaskEnvironment /* tag */)
- : scoped_task_environment_(base::nullopt) {
+ : task_environment_(base::nullopt) {
// MaterialDesignController is initialized here instead of in SetUp because
// a subclass might construct a MaterialDesignControllerTestAPI as a member to
// override the value, and this must happen first.
diff --git a/ui/views/test/views_test_base.h b/ui/views/test/views_test_base.h
index 69919a2..d0cf2735 100644
--- a/ui/views/test/views_test_base.h
+++ b/ui/views/test/views_test_base.h
@@ -42,14 +42,13 @@
};
// Constructs a ViewsTestBase with |traits| being forwarded to its
- // ScopedTaskEnvironment. MainThreadType always defaults to UI and must not be
+ // TaskEnvironment. MainThreadType always defaults to UI and must not be
// specified.
template <typename... TaskEnvironmentTraits>
NOINLINE explicit ViewsTestBase(TaskEnvironmentTraits... traits)
- : scoped_task_environment_(
- base::in_place,
- base::test::ScopedTaskEnvironment::MainThreadType::UI,
- traits...) {
+ : task_environment_(base::in_place,
+ base::test::TaskEnvironment::MainThreadType::UI,
+ traits...) {
// MaterialDesignController is initialized here instead of in SetUp because
// a subclass might construct a MaterialDesignControllerTestAPI as a member
// to override the value, and this must happen first.
@@ -57,7 +56,7 @@
}
// Alternatively a subclass may pass this tag to ask this ViewsTestBase not to
- // instantiate a ScopedTaskEnvironment. The subclass is then responsible to
+ // instantiate a TaskEnvironment. The subclass is then responsible to
// instantiate one before ViewsTestBase::SetUp().
struct SubclassManagesTaskEnvironment {};
explicit ViewsTestBase(SubclassManagesTaskEnvironment tag);
@@ -126,7 +125,7 @@
protected:
// Initialized first, destroyed last. Use this protected member directly from
// the test body to drive tasks posted within a ViewsTestBase-based test.
- base::Optional<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+ base::Optional<base::test::TaskEnvironment> task_environment_;
private:
// Controls what type of widget will be created by default for a test (i.e.
diff --git a/ui/views/test/widget_test.h b/ui/views/test/widget_test.h
index 81e0b5fa..d021ebcb 100644
--- a/ui/views/test/widget_test.h
+++ b/ui/views/test/widget_test.h
@@ -46,7 +46,7 @@
using WidgetAutoclosePtr = std::unique_ptr<Widget, WidgetCloser>;
// Constructs an AshTestBase with |traits| being forwarded to its
- // ScopedTaskEnvironment. |ViewsTestBase::SubclassManagesTaskEnvironment()|
+ // TaskEnvironment. |ViewsTestBase::SubclassManagesTaskEnvironment()|
// can also be passed as a sole trait to indicate that this WidgetTest's
// subclass will manage the task environment.
template <typename... TaskEnvironmentTraits>
diff --git a/url/mojom/url_gurl_mojom_traits_unittest.cc b/url/mojom/url_gurl_mojom_traits_unittest.cc
index 1e44fc64..667578a6 100644
--- a/url/mojom/url_gurl_mojom_traits_unittest.cc
+++ b/url/mojom/url_gurl_mojom_traits_unittest.cc
@@ -33,7 +33,7 @@
// Mojo version of chrome IPC test in url/ipc/url_param_traits_unittest.cc.
TEST(MojoGURLStructTraitsTest, Basic) {
- base::test::ScopedTaskEnvironment scoped_task_environment;
+ base::test::TaskEnvironment task_environment;
mojom::UrlTestPtr proxy;
UrlTestImpl impl(MakeRequest(&proxy));