| commit | ca52d1b93d9e1ad50b2b17f12c3bcdd30512ef62 | [log] [tgz] |
|---|---|---|
| author | Toby Huang <[email protected]> | Thu Oct 15 19:03:38 2020 |
| committer | Commit Bot <[email protected]> | Thu Oct 15 19:03:38 2020 |
| tree | 0364e7cd5e4a3e4a640271db0fa4705072e9a81f | |
| parent | 78863838a5f535e61c8f844152d41fd73e8b7a6d [diff] |
[M87 Merge][Metrics] Disable FamilyUserMetricsProvider FamilyUserMetricsProvider currently causes a crash bug in guest mode. Disable the feature flag and browser test while looking into a fix. (cherry picked from commit 6e5972c83955129cd02bae8dc321b3f1b2a4c1d1) Bug: 1137352 Change-Id: Ia327e39754f2bd48c9e9bfec11e4b1e6d47c447a Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472263 Auto-Submit: Toby Huang <[email protected]> Reviewed-by: Aga Wronska <[email protected]> Reviewed-by: Alexei Svitkine <[email protected]> Commit-Queue: Alexei Svitkine <[email protected]> Cr-Original-Commit-Position: refs/heads/master@{#817167} Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2472906 Reviewed-by: Toby Huang <[email protected]> Commit-Queue: Toby Huang <[email protected]> Cr-Commit-Position: refs/branch-heads/4280@{#418} Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
diff --git a/chrome/browser/chromeos/child_accounts/family_features.cc b/chrome/browser/chromeos/child_accounts/family_features.cc index f0ab0eb..ca98c1566 100644 --- a/chrome/browser/chromeos/child_accounts/family_features.cc +++ b/chrome/browser/chromeos/child_accounts/family_features.cc
@@ -7,6 +7,6 @@ namespace chromeos { const base::Feature kFamilyUserMetricsProvider{ - "FamilyUserMetricsProvider", base::FEATURE_ENABLED_BY_DEFAULT}; + "FamilyUserMetricsProvider", base::FEATURE_DISABLED_BY_DEFAULT}; } // namespace chromeos
diff --git a/chrome/browser/metrics/family_user_metrics_provider_browsertest.cc b/chrome/browser/metrics/family_user_metrics_provider_browsertest.cc index 2200935..4f01b97 100644 --- a/chrome/browser/metrics/family_user_metrics_provider_browsertest.cc +++ b/chrome/browser/metrics/family_user_metrics_provider_browsertest.cc
@@ -87,7 +87,7 @@ /*use_local_policy_server=*/false}; }; -IN_PROC_BROWSER_TEST_P(FamilyUserMetricsProviderTest, UserCategory) { +IN_PROC_BROWSER_TEST_P(FamilyUserMetricsProviderTest, DISABLED_UserCategory) { base::HistogramTester histogram_tester; FamilyUserMetricsProvider provider; // Simulate calling ProvideCurrentSessionData() prior to logging in.