Commit 4b9aa0f7 authored by Asanka Herath's avatar Asanka Herath Committed by Commit Bot

[privacy_budget] Deflake UkmEntryFilter tests.

R=caraitto@chromium.org

Bug: 1108942
Change-Id: I2bd72849d79a64d85cb9b61e87efe226d48a0cbd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366662
Auto-Submit: Asanka Herath <asanka@chromium.org>
Reviewed-by: default avatarCaleb Raitto <caraitto@chromium.org>
Commit-Queue: Asanka Herath <asanka@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800263}
parent 3306a492
...@@ -116,6 +116,11 @@ bool IdentifiabilityStudyState::ShouldSampleSurface( ...@@ -116,6 +116,11 @@ bool IdentifiabilityStudyState::ShouldSampleSurface(
return should_record; return should_record;
} }
// static
void IdentifiabilityStudyState::ResetStateForTesting() {
blink::IdentifiabilityStudySettings::ResetStateForTesting();
}
// static // static
void IdentifiabilityStudyState::InitializeGlobalStudySettings() { void IdentifiabilityStudyState::InitializeGlobalStudySettings() {
blink::IdentifiabilityStudySettings::SetGlobalProvider( blink::IdentifiabilityStudySettings::SetGlobalProvider(
......
...@@ -59,6 +59,10 @@ class IdentifiabilityStudyState { ...@@ -59,6 +59,10 @@ class IdentifiabilityStudyState {
// Calling this method may alter the state of the study settings. // Calling this method may alter the state of the study settings.
bool ShouldSampleSurface(blink::IdentifiableSurface surface); bool ShouldSampleSurface(blink::IdentifiableSurface surface);
// Should be called from unit-tests if multiple IdentifiabilityStudyState
// instances are to be constructed.
static void ResetStateForTesting();
// A knob that we can use to split data sets from different versions of the // A knob that we can use to split data sets from different versions of the
// implementation where the differences could have material effects on the // implementation where the differences could have material effects on the
// data distribution. // data distribution.
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "base/containers/flat_map.h" #include "base/containers/flat_map.h"
#include "base/template_util.h" #include "base/template_util.h"
#include "chrome/browser/privacy_budget/identifiability_study_state.h"
#include "chrome/common/privacy_budget/scoped_privacy_budget_config.h" #include "chrome/common/privacy_budget/scoped_privacy_budget_config.h"
#include "components/prefs/testing_pref_service.h" #include "components/prefs/testing_pref_service.h"
#include "services/metrics/public/cpp/ukm_builders.h" #include "services/metrics/public/cpp/ukm_builders.h"
...@@ -35,9 +36,9 @@ class PrivacyBudgetUkmEntryFilterTest : public ::testing::Test { ...@@ -35,9 +36,9 @@ class PrivacyBudgetUkmEntryFilterTest : public ::testing::Test {
} // namespace } // namespace
// TODO(crbug.com/1117358) Flaky
TEST(PrivacyBudgetUkmEntryFilterStandaloneTest, TEST(PrivacyBudgetUkmEntryFilterStandaloneTest,
DISABLED_BlocksIdentifiabilityMetricsByDefault) { BlocksIdentifiabilityMetricsByDefault) {
IdentifiabilityStudyState::ResetStateForTesting();
TestingPrefServiceSimple pref_service; TestingPrefServiceSimple pref_service;
prefs::RegisterPrivacyBudgetPrefs(pref_service.registry()); prefs::RegisterPrivacyBudgetPrefs(pref_service.registry());
auto settings = std::make_unique<IdentifiabilityStudyState>(&pref_service); auto settings = std::make_unique<IdentifiabilityStudyState>(&pref_service);
...@@ -55,8 +56,8 @@ TEST(PrivacyBudgetUkmEntryFilterStandaloneTest, ...@@ -55,8 +56,8 @@ TEST(PrivacyBudgetUkmEntryFilterStandaloneTest,
} }
// TODO(crbug.com/1117358) Flaky // TODO(crbug.com/1117358) Flaky
TEST(PrivacyBudgetUkmEntryFilterStandaloneTest, TEST(PrivacyBudgetUkmEntryFilterStandaloneTest, AllowsOtherMetricsByDefault) {
DISABLED_AllowsOtherMetricsByDefault) { IdentifiabilityStudyState::ResetStateForTesting();
TestingPrefServiceSimple pref_service; TestingPrefServiceSimple pref_service;
prefs::RegisterPrivacyBudgetPrefs(pref_service.registry()); prefs::RegisterPrivacyBudgetPrefs(pref_service.registry());
auto settings = std::make_unique<IdentifiabilityStudyState>(&pref_service); auto settings = std::make_unique<IdentifiabilityStudyState>(&pref_service);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment