[scheduling] Use ScopedTaskEnvironment instead of MessageLoop
MessageLoop will go away, eventually.
BUG=891670
Change-Id: I6992d6773ec3f753fe8c225dee223b522593347b
Reviewed-on: https://chromium-review.googlesource.com/c/1323449
Reviewed-by: Robert Kaplow <[email protected]>
Reviewed-by: Alexander Timin <[email protected]>
Commit-Queue: Carlos Caballero <[email protected]>
Cr-Commit-Position: refs/heads/master@{#607187}diff --git a/components/variations/child_process_field_trial_syncer_unittest.cc b/components/variations/child_process_field_trial_syncer_unittest.cc
index fbfe7ac..2dffaa0 100644
--- a/components/variations/child_process_field_trial_syncer_unittest.cc
+++ b/components/variations/child_process_field_trial_syncer_unittest.cc
@@ -10,9 +10,9 @@
#include "base/base_switches.h"
#include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "components/variations/variations_crash_keys.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -53,7 +53,7 @@
} // namespace
TEST(ChildProcessFieldTrialSyncerTest, FieldTrialState) {
- base::MessageLoop message_loop;
+ base::test::ScopedTaskEnvironment 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/synthetic_trial_registry_unittest.cc b/components/variations/synthetic_trial_registry_unittest.cc
index 403c134..5e8f0f3 100644
--- a/components/variations/synthetic_trial_registry_unittest.cc
+++ b/components/variations/synthetic_trial_registry_unittest.cc
@@ -6,9 +6,9 @@
#include <string>
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/strings/stringprintf.h"
+#include "base/test/scoped_task_environment.h"
#include "components/variations/active_field_trials.h"
#include "components/variations/hashing.h"
#include "components/variations/synthetic_trials_active_group_id_provider.h"
@@ -47,7 +47,7 @@
}
private:
- base::MessageLoop loop_;
+ base::test::ScopedTaskEnvironment 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 8d5f802e..a28cc5a0 100644
--- a/components/variations/variations_crash_keys_unittest.cc
+++ b/components/variations/variations_crash_keys_unittest.cc
@@ -6,9 +6,9 @@
#include <string>
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "build/build_config.h"
#include "components/crash/core/common/crash_key.h"
#include "components/variations/hashing.h"
@@ -42,7 +42,7 @@
}
private:
- base::MessageLoop loop_;
+ base::test::ScopedTaskEnvironment 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 4fad592..70d1cbe 100644
--- a/components/variations/variations_http_header_provider_unittest.cc
+++ b/components/variations/variations_http_header_provider_unittest.cc
@@ -7,9 +7,9 @@
#include <string>
#include "base/base64.h"
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "components/variations/entropy_provider.h"
#include "components/variations/proto/client_variations.pb.h"
#include "components/variations/variations_associated_data.h"
@@ -61,7 +61,7 @@
};
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_Valid) {
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Valid experiment ids.
@@ -80,7 +80,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_ValidCommandLine) {
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Valid experiment ids.
@@ -99,7 +99,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, ForceVariationIds_Invalid) {
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment task_environment;
VariationsHttpHeaderProvider provider;
// Invalid experiment ids.
@@ -122,7 +122,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, OnFieldTrialGroupFinalized) {
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
VariationsHttpHeaderProvider provider;
provider.InitVariationIDsCacheIfNeeded();
@@ -171,7 +171,7 @@
}
TEST_F(VariationsHttpHeaderProviderTest, GetVariationsString) {
- base::MessageLoop loop;
+ base::test::ScopedTaskEnvironment task_environment;
base::FieldTrialList field_trial_list(nullptr);
CreateTrialAndAssociateId("t1", "g1", GOOGLE_WEB_PROPERTIES, 123);
diff --git a/components/variations/variations_id_collection_unittest.cc b/components/variations/variations_id_collection_unittest.cc
index 0ec36fc..a17343d9 100644
--- a/components/variations/variations_id_collection_unittest.cc
+++ b/components/variations/variations_id_collection_unittest.cc
@@ -7,8 +7,9 @@
#include <memory>
#include <vector>
-#include "base/message_loop/message_loop.h"
#include "base/metrics/field_trial.h"
+#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "components/variations/variations_associated_data.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -72,7 +73,7 @@
VariationsIdCollection* collection() { return collection_.get(); }
private:
- base::MessageLoop message_loop_;
+ base::test::ScopedTaskEnvironment 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 9d5f6b6..0598816 100644
--- a/components/variations/variations_request_scheduler_mobile_unittest.cc
+++ b/components/variations/variations_request_scheduler_mobile_unittest.cc
@@ -5,7 +5,7 @@
#include "components/variations/variations_request_scheduler_mobile.h"
#include "base/bind.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/testing_pref_service.h"
#include "components/variations/pref_names.h"
@@ -16,7 +16,7 @@
namespace {
// Simple method used to verify a Callback has been triggered.
-void Increment(int *n) {
+void Increment(int* n) {
(*n)++;
}
@@ -49,7 +49,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundNoRun) {
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
@@ -76,7 +76,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundRun) {
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
@@ -102,7 +102,7 @@
}
TEST(VariationsRequestSchedulerMobileTest, OnAppEnterForegroundOnStartup) {
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment task_environment;
TestingPrefServiceSimple prefs;
diff --git a/components/variations/variations_request_scheduler_unittest.cc b/components/variations/variations_request_scheduler_unittest.cc
index ca5d6fa..f751e793 100644
--- a/components/variations/variations_request_scheduler_unittest.cc
+++ b/components/variations/variations_request_scheduler_unittest.cc
@@ -6,13 +6,13 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "base/message_loop/message_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace variations {
TEST(VariationsRequestSchedulerTest, ScheduleFetchShortly) {
- base::MessageLoopForUI message_loop_;
+ base::test::ScopedTaskEnvironment task_environment;
const base::Closure task = base::DoNothing();
VariationsRequestScheduler scheduler(task);
