Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(109)

Unified Diff: components/metrics/metrics_service_unittest.cc

Issue 1859213002: Move the thread hop for UMA user actions from content:: to base::. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing Chromecast (I hope!) Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/metrics/metrics_service_unittest.cc
diff --git a/components/metrics/metrics_service_unittest.cc b/components/metrics/metrics_service_unittest.cc
index 4a8aea770e9f7feb3bdd64239885d2ca4e9321a0..461abfc14d3f4d83fd852f14410a524fda6eb149 100644
--- a/components/metrics/metrics_service_unittest.cc
+++ b/components/metrics/metrics_service_unittest.cc
@@ -13,6 +13,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/metrics/metrics_hashes.h"
+#include "base/metrics/user_metrics.h"
#include "base/metrics/statistics_recorder.h"
#include "base/threading/platform_thread.h"
#include "components/metrics/client_info.h"
@@ -169,6 +170,7 @@ TEST_F(MetricsServiceTest, InitialStabilityLogAfterCleanShutDown) {
GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, true);
TestMetricsServiceClient client;
+ base::ResetRecordActionTaskRunnerForTesting();
TestMetricsService service(
GetMetricsStateManager(), &client, GetLocalState());
@@ -207,6 +209,7 @@ TEST_F(MetricsServiceTest, InitialStabilityLogAtProviderRequest) {
// log to be produced, irrespective provider requests.
GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, true);
+ base::ResetRecordActionTaskRunnerForTesting();
TestMetricsService service(
GetMetricsStateManager(), &client, GetLocalState());
// Add a metrics provider that requests a stability log.
@@ -273,6 +276,7 @@ TEST_F(MetricsServiceTest, InitialStabilityLogAfterCrash) {
GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, false);
+ base::ResetRecordActionTaskRunnerForTesting();
TestMetricsService service(
GetMetricsStateManager(), &client, GetLocalState());
// Add a provider.
@@ -315,6 +319,7 @@ TEST_F(MetricsServiceTest, InitialStabilityLogAfterCrash) {
TEST_F(MetricsServiceTest, RegisterSyntheticTrial) {
TestMetricsServiceClient client;
+ base::ResetRecordActionTaskRunnerForTesting();
MetricsService service(GetMetricsStateManager(), &client, GetLocalState());
// Add two synthetic trials and confirm that they show up in the list.
@@ -385,6 +390,7 @@ TEST_F(MetricsServiceTest, RegisterSyntheticTrial) {
TEST_F(MetricsServiceTest,
MetricsProviderOnRecordingDisabledCalledOnInitialStop) {
TestMetricsServiceClient client;
+ base::ResetRecordActionTaskRunnerForTesting();
TestMetricsService service(
GetMetricsStateManager(), &client, GetLocalState());
@@ -399,6 +405,7 @@ TEST_F(MetricsServiceTest,
TEST_F(MetricsServiceTest, MetricsProvidersInitialized) {
TestMetricsServiceClient client;
+ base::ResetRecordActionTaskRunnerForTesting();
TestMetricsService service(
GetMetricsStateManager(), &client, GetLocalState());

Powered by Google App Engine
This is Rietveld 408576698