Commit 1bec8fe2 authored by Gabriel Charette's avatar Gabriel Charette Committed by Commit Bot

Backport some tests in /services/preferences to SingleThreadTaskEnvironment

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

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

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

This CL was uploaded by git cl split.

R=jonross@chromium.org

Bug: 891670
Change-Id: I2267eede47df2efb13f39d8be4500a24f82d2de5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787112
Auto-Submit: Gabriel Charette <gab@chromium.org>
Reviewed-by: default avatarJonathan Ross <jonross@chromium.org>
Commit-Queue: Jonathan Ross <jonross@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693758}
parent c50c743e
...@@ -73,7 +73,7 @@ class PersistentPrefStoreImplTest : public testing::Test { ...@@ -73,7 +73,7 @@ class PersistentPrefStoreImplTest : public testing::Test {
PersistentPrefStore* pref_store() { return pref_store_.get(); } PersistentPrefStore* pref_store() { return pref_store_.get(); }
private: private:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<PersistentPrefStoreImpl> impl_; std::unique_ptr<PersistentPrefStoreImpl> impl_;
......
...@@ -247,7 +247,7 @@ class PrefServiceFactoryTest : public testing::Test { ...@@ -247,7 +247,7 @@ class PrefServiceFactoryTest : public testing::Test {
quit_closure.Run(); quit_closure.Run();
} }
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
service_manager::TestServiceManager test_service_manager_; service_manager::TestServiceManager test_service_manager_;
base::ScopedTempDir profile_dir_; base::ScopedTempDir profile_dir_;
scoped_refptr<WriteablePrefStore> above_user_prefs_pref_store_; scoped_refptr<WriteablePrefStore> above_user_prefs_pref_store_;
......
...@@ -202,7 +202,7 @@ class PersistentPrefStoreConsistencyTest : public testing::Test { ...@@ -202,7 +202,7 @@ class PersistentPrefStoreConsistencyTest : public testing::Test {
private: private:
scoped_refptr<PersistentPrefStore> pref_store_; scoped_refptr<PersistentPrefStore> pref_store_;
std::unique_ptr<PersistentPrefStoreImpl> pref_store_impl_; std::unique_ptr<PersistentPrefStoreImpl> pref_store_impl_;
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
}; };
TEST_F(PersistentPrefStoreConsistencyTest, TwoPrefs) { TEST_F(PersistentPrefStoreConsistencyTest, TwoPrefs) {
......
...@@ -102,7 +102,7 @@ class PrefStoreImplTest : public testing::Test { ...@@ -102,7 +102,7 @@ class PrefStoreImplTest : public testing::Test {
PrefStore* pref_store() { return pref_store_.get(); } PrefStore* pref_store() { return pref_store_.get(); }
private: private:
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<PrefStoreImpl> impl_; std::unique_ptr<PrefStoreImpl> impl_;
......
...@@ -102,7 +102,7 @@ class PersistentPrefStoreClientTest : public testing::Test, ...@@ -102,7 +102,7 @@ class PersistentPrefStoreClientTest : public testing::Test,
void ClearMutableValues() override {} void ClearMutableValues() override {}
void OnStoreDeletionFromDisk() override {} void OnStoreDeletionFromDisk() override {}
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
std::unique_ptr<PrefService> pref_service_; std::unique_ptr<PrefService> pref_service_;
......
...@@ -66,7 +66,7 @@ class PrefStoreClientTest : public testing::Test { ...@@ -66,7 +66,7 @@ class PrefStoreClientTest : public testing::Test {
scoped_refptr<PrefStoreClient> store_; scoped_refptr<PrefStoreClient> store_;
// Required by mojo binding code within PrefStoreClient. // Required by mojo binding code within PrefStoreClient.
base::test::TaskEnvironment task_environment_; base::test::SingleThreadTaskEnvironment task_environment_;
DISALLOW_COPY_AND_ASSIGN(PrefStoreClientTest); DISALLOW_COPY_AND_ASSIGN(PrefStoreClientTest);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment