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

Unified Diff: chrome/browser/metrics/metrics_service_unittest.cc

Issue 289373007: Rename MetricsServiceHelper to ChromeMetricsServiceAccessor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 6 years, 7 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: chrome/browser/metrics/metrics_service_unittest.cc
diff --git a/chrome/browser/metrics/metrics_service_unittest.cc b/chrome/browser/metrics/metrics_service_unittest.cc
index 771cc1e2f6821fc65005b96f0131680ed9387130..2f3996bc7c9fc9c3543c82f1d3a5a8460f493b72 100644
--- a/chrome/browser/metrics/metrics_service_unittest.cc
+++ b/chrome/browser/metrics/metrics_service_unittest.cc
@@ -294,43 +294,6 @@ TEST_F(MetricsServiceTest, RegisterSyntheticTrial) {
service.log_manager_.FinishCurrentLog();
}
-TEST_F(MetricsServiceTest, MetricsReportingEnabled) {
-#if !defined(OS_CHROMEOS)
- GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, false);
- EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
- GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, true);
- EXPECT_TRUE(MetricsServiceHelper::IsMetricsReportingEnabled());
- GetLocalState()->ClearPref(prefs::kMetricsReportingEnabled);
- EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
-#else
- // ChromeOS does not register prefs::kMetricsReportingEnabled and uses
- // device settings for metrics reporting.
- EXPECT_FALSE(MetricsServiceHelper::IsMetricsReportingEnabled());
-#endif
-}
-
-TEST_F(MetricsServiceTest, CrashReportingEnabled) {
-#if defined(GOOGLE_CHROME_BUILD)
-// ChromeOS has different device settings for crash reporting.
-#if !defined(OS_CHROMEOS)
-#if defined(OS_ANDROID)
- const char* crash_pref = prefs::kCrashReportingEnabled;
-#else
- const char* crash_pref = prefs::kMetricsReportingEnabled;
-#endif
- GetLocalState()->SetBoolean(crash_pref, false);
- EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
- GetLocalState()->SetBoolean(crash_pref, true);
- EXPECT_TRUE(MetricsServiceHelper::IsCrashReportingEnabled());
- GetLocalState()->ClearPref(crash_pref);
- EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
-#endif // !defined(OS_CHROMEOS)
-#else // defined(GOOGLE_CHROME_BUILD)
- // Chromium branded browsers never have crash reporting enabled.
- EXPECT_FALSE(MetricsServiceHelper::IsCrashReportingEnabled());
-#endif // defined(GOOGLE_CHROME_BUILD)
-}
-
TEST_F(MetricsServiceTest, MetricsServiceObserver) {
MetricsService service(GetMetricsStateManager());
TestMetricsServiceObserver observer1;

Powered by Google App Engine
This is Rietveld 408576698