Move the thread hop for UMA user actions from content:: to base::.

components/metrics/metrics_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/metrics/metrics_service.h"
 
 #include <stdint.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #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"
 #include "components/metrics/metrics_log.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/metrics/metrics_state_manager.h"
 #include "components/metrics/test_metrics_provider.h"
 #include "components/metrics/test_metrics_service_client.h"
 #include "components/prefs/testing_pref_service.h"
 #include "components/variations/metrics_util.h"
@@ skipping 136 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(MetricsServiceTest);
 };
 
 }  // namespace
 
 TEST_F(MetricsServiceTest, InitialStabilityLogAfterCleanShutDown) {
   EnableMetricsReporting();
   GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, true);
 
   TestMetricsServiceClient client;
+  base::ResetRecordActionTaskRunnerForTesting();
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
 
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(scoped_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
   // No initial stability log should be generated.
   EXPECT_FALSE(service.log_manager()->has_unsent_logs());
   EXPECT_FALSE(service.log_manager()->has_staged_log());
@@ skipping 18 matching lines @@
   // stability metrics (including exited cleanly flag) won't be cleared.
   GetLocalState()->SetInt64(prefs::kStabilityStatsBuildTime,
                             MetricsLog::GetBuildTime());
   GetLocalState()->SetString(prefs::kStabilityStatsVersion,
                              client.GetVersionString());
 
   // Set the clean exit flag, as that will otherwise cause a stabilty
   // 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.
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   test_provider->set_has_initial_stability_metrics(true);
   service.RegisterMetricsProvider(
       scoped_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
 
@@ skipping 46 matching lines @@
 
   // Record stability build time and version from previous session, so that
   // stability metrics (including exited cleanly flag) won't be cleared.
   GetLocalState()->SetInt64(prefs::kStabilityStatsBuildTime,
                             MetricsLog::GetBuildTime());
   GetLocalState()->SetString(prefs::kStabilityStatsVersion,
                              client.GetVersionString());
 
   GetLocalState()->SetBoolean(prefs::kStabilityExitedCleanly, false);
 
+  base::ResetRecordActionTaskRunnerForTesting();
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
   // Add a provider.
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(scoped_ptr<MetricsProvider>(test_provider));
   service.InitializeMetricsRecordingState();
 
   // The initial stability log should be generated and persisted in unsent logs.
   MetricsLogManager* log_manager = service.log_manager();
   EXPECT_TRUE(log_manager->has_unsent_logs());
@@ skipping 22 matching lines @@
   EXPECT_EQ(0, uma_log.omnibox_event_size());
   EXPECT_EQ(0, uma_log.profiler_event_size());
   EXPECT_EQ(0, uma_log.perf_data_size());
   CheckForNonStabilityHistograms(uma_log);
 
   EXPECT_EQ(1, uma_log.system_profile().stability().crash_count());
 }
 
 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.
   variations::SyntheticTrialGroup trial1(HashName("TestTrial1"),
                                          HashName("Group1"));
   service.RegisterSyntheticFieldTrial(trial1);
 
   variations::SyntheticTrialGroup trial2(HashName("TestTrial2"),
                                          HashName("Group2"));
   service.RegisterSyntheticFieldTrial(trial2);
@@ skipping 50 matching lines @@
   EXPECT_EQ(3U, synthetic_trials.size());
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial1", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial2", "Group2"));
   EXPECT_TRUE(HasSyntheticTrial(synthetic_trials, "TestTrial3", "Group3"));
   service.log_manager_.FinishCurrentLog();
 }
 
 TEST_F(MetricsServiceTest,
        MetricsProviderOnRecordingDisabledCalledOnInitialStop) {
   TestMetricsServiceClient client;
+  base::ResetRecordActionTaskRunnerForTesting();
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
 
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(scoped_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
   service.Stop();
 
   EXPECT_TRUE(test_provider->on_recording_disabled_called());
 }
 
 TEST_F(MetricsServiceTest, MetricsProvidersInitialized) {
   TestMetricsServiceClient client;
+  base::ResetRecordActionTaskRunnerForTesting();
   TestMetricsService service(
       GetMetricsStateManager(), &client, GetLocalState());
 
   TestMetricsProvider* test_provider = new TestMetricsProvider();
   service.RegisterMetricsProvider(scoped_ptr<MetricsProvider>(test_provider));
 
   service.InitializeMetricsRecordingState();
 
   EXPECT_TRUE(test_provider->init_called());
 }
 
 }  // namespace metrics