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

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

Issue 916133003: Fix ChromeMetricsServiceAccessor::IsMetricsReportingEnabled on CrOs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase before submit Created 5 years, 10 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/chrome_metrics_service_accessor_unittest.cc
diff --git a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
index dc0271bd52afb771a1619ca4c50da953281e2f5d..7c93160aacfdc0df437ed600b953593dd0d48c2f 100644
--- a/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_accessor_unittest.cc
@@ -26,6 +26,7 @@ class ChromeMetricsServiceAccessorTest : public testing::Test {
};
TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
+#if defined(GOOGLE_CHROME_BUILD)
#if !defined(OS_CHROMEOS)
GetLocalState()->SetBoolean(prefs::kMetricsReportingEnabled, false);
EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
@@ -38,6 +39,10 @@ TEST_F(ChromeMetricsServiceAccessorTest, MetricsReportingEnabled) {
// device settings for metrics reporting.
EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
#endif
+#else
+ // Metrics Reporting is never enabled when GOOGLE_CHROME_BUILD is undefined.
+ EXPECT_FALSE(ChromeMetricsServiceAccessor::IsMetricsReportingEnabled());
+#endif
}
TEST_F(ChromeMetricsServiceAccessorTest, CrashReportingEnabled) {
« no previous file with comments | « chrome/browser/metrics/chrome_metrics_service_accessor.cc ('k') | chrome/browser/metrics/metrics_services_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698