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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc

Issue 2384213002: Send a TrackedPreference incident when registry pref validation fails. (Closed)
Patch Set: Handle UNSUPPORTED in another switch Created 4 years, 2 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
« no previous file with comments | « chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.cc ('k') | chrome/common/safe_browsing/csd.proto » ('j') | components/user_prefs/tracked/tracked_preference_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
diff --git a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
index b701be4ad936b33ee5b1b99b3c44b5528884042e..bce975d59ccd39a45ab28db8990943112b400fff 100644
--- a/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
+++ b/chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate_unittest.cc
@@ -50,6 +50,7 @@ class PreferenceValidationDelegateTest : public testing::Test {
static void ExpectValueStatesEquate(
PrefHashStoreTransaction::ValueState store_state,
+ PrefHashStoreTransaction::ValueState external_validation_value_state,
safe_browsing::
ClientIncidentReport_IncidentData_TrackedPreferenceIncident_ValueState
incident_state) {
@@ -66,7 +67,15 @@ class PreferenceValidationDelegateTest : public testing::Test {
EXPECT_EQ(TPIncident::UNTRUSTED_UNKNOWN_VALUE, incident_state);
break;
default:
- FAIL() << "unexpected store state";
+ if (external_validation_value_state ==
+ PrefHashStoreTransaction::CLEARED) {
+ EXPECT_EQ(TPIncident::BYPASS_CLEARED, incident_state);
+ } else if (external_validation_value_state ==
+ PrefHashStoreTransaction::CHANGED) {
+ EXPECT_EQ(TPIncident::BYPASS_CHANGED, incident_state);
+ } else {
+ FAIL() << "unexpected store state";
+ }
break;
}
}
@@ -90,10 +99,9 @@ class PreferenceValidationDelegateTest : public testing::Test {
// Tests that a NULL value results in an incident with no value.
TEST_F(PreferenceValidationDelegateTest, NullValue) {
- instance_->OnAtomicPreferenceValidation(kPrefPath_,
- NULL,
- PrefHashStoreTransaction::CLEARED,
- false /* is_personal */);
+ instance_->OnAtomicPreferenceValidation(
+ kPrefPath_, NULL, PrefHashStoreTransaction::CLEARED,
+ PrefHashStoreTransaction::UNSUPPORTED, false /* is_personal */);
std::unique_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
incidents_.back()->TakePayload());
EXPECT_FALSE(incident->tracked_preference().has_atomic_value());
@@ -154,10 +162,10 @@ class PreferenceValidationDelegateValues
};
TEST_P(PreferenceValidationDelegateValues, Value) {
- instance_->OnAtomicPreferenceValidation(kPrefPath_,
- MakeValue(value_type_).get(),
- PrefHashStoreTransaction::CLEARED,
- false /* is_personal */);
+ instance_->OnAtomicPreferenceValidation(
+ kPrefPath_, MakeValue(value_type_).get(),
+ PrefHashStoreTransaction::CLEARED, PrefHashStoreTransaction::UNSUPPORTED,
+ false /* is_personal */);
ASSERT_EQ(1U, incidents_.size());
std::unique_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
incidents_.back()->TakePayload());
@@ -190,60 +198,70 @@ INSTANTIATE_TEST_CASE_P(
// Tests that no incidents are reported for relevant combinations of ValueState.
class PreferenceValidationDelegateNoIncident
: public PreferenceValidationDelegateTest,
- public testing::WithParamInterface<PrefHashStoreTransaction::ValueState> {
+ public testing::WithParamInterface<
+ std::tr1::tuple<PrefHashStoreTransaction::ValueState,
+ PrefHashStoreTransaction::ValueState>> {
protected:
void SetUp() override {
PreferenceValidationDelegateTest::SetUp();
- value_state_ = GetParam();
+ value_state_ = std::tr1::get<0>(GetParam());
+ external_validation_value_state_ = std::tr1::get<1>(GetParam());
}
PrefHashStoreTransaction::ValueState value_state_;
+ PrefHashStoreTransaction::ValueState external_validation_value_state_;
};
TEST_P(PreferenceValidationDelegateNoIncident, Atomic) {
- instance_->OnAtomicPreferenceValidation(kPrefPath_,
- null_value_.get(),
- value_state_,
- false /* is_personal */);
+ instance_->OnAtomicPreferenceValidation(
+ kPrefPath_, null_value_.get(), value_state_,
+ external_validation_value_state_, false /* is_personal */);
EXPECT_EQ(0U, incidents_.size());
}
TEST_P(PreferenceValidationDelegateNoIncident, Split) {
- instance_->OnSplitPreferenceValidation(kPrefPath_,
- &dict_value_,
- invalid_keys_,
- value_state_,
- false /* is_personal */);
+ instance_->OnSplitPreferenceValidation(
+ kPrefPath_, &dict_value_, invalid_keys_, value_state_,
+ external_validation_value_state_, false /* is_personal */);
EXPECT_EQ(0U, incidents_.size());
}
INSTANTIATE_TEST_CASE_P(
NoIncident,
PreferenceValidationDelegateNoIncident,
- testing::Values(PrefHashStoreTransaction::UNCHANGED,
- PrefHashStoreTransaction::SECURE_LEGACY,
- PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE));
+ testing::Combine(
+ testing::Values(PrefHashStoreTransaction::UNCHANGED,
+ PrefHashStoreTransaction::SECURE_LEGACY,
+ PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE),
+ testing::Values(PrefHashStoreTransaction::UNCHANGED,
+ PrefHashStoreTransaction::UNSUPPORTED,
+ PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE)));
// Tests that incidents are reported for relevant combinations of ValueState and
// impersonal/personal.
class PreferenceValidationDelegateWithIncident
: public PreferenceValidationDelegateTest,
public testing::WithParamInterface<
- std::tr1::tuple<PrefHashStoreTransaction::ValueState, bool>> {
+ std::tr1::tuple<PrefHashStoreTransaction::ValueState,
+ PrefHashStoreTransaction::ValueState,
+ bool>> {
protected:
void SetUp() override {
PreferenceValidationDelegateTest::SetUp();
value_state_ = std::tr1::get<0>(GetParam());
- is_personal_ = std::tr1::get<1>(GetParam());
+ external_validation_value_state_ = std::tr1::get<1>(GetParam());
+ is_personal_ = std::tr1::get<2>(GetParam());
}
PrefHashStoreTransaction::ValueState value_state_;
+ PrefHashStoreTransaction::ValueState external_validation_value_state_;
bool is_personal_;
};
TEST_P(PreferenceValidationDelegateWithIncident, Atomic) {
instance_->OnAtomicPreferenceValidation(
- kPrefPath_, null_value_.get(), value_state_, is_personal_);
+ kPrefPath_, null_value_.get(), value_state_,
+ external_validation_value_state_, is_personal_);
ASSERT_EQ(1U, incidents_.size());
std::unique_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
incidents_.back()->TakePayload());
@@ -260,12 +278,14 @@ TEST_P(PreferenceValidationDelegateWithIncident, Atomic) {
EXPECT_FALSE(tp_incident.has_atomic_value());
}
EXPECT_TRUE(tp_incident.has_value_state());
- ExpectValueStatesEquate(value_state_, tp_incident.value_state());
+ ExpectValueStatesEquate(value_state_, external_validation_value_state_,
+ tp_incident.value_state());
}
TEST_P(PreferenceValidationDelegateWithIncident, Split) {
instance_->OnSplitPreferenceValidation(
- kPrefPath_, &dict_value_, invalid_keys_, value_state_, is_personal_);
+ kPrefPath_, &dict_value_, invalid_keys_, value_state_,
+ external_validation_value_state_, is_personal_);
ASSERT_EQ(1U, incidents_.size());
std::unique_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
incidents_.back()->TakePayload());
@@ -280,7 +300,8 @@ TEST_P(PreferenceValidationDelegateWithIncident, Split) {
else
EXPECT_EQ(0, tp_incident.split_key_size());
EXPECT_TRUE(tp_incident.has_value_state());
- ExpectValueStatesEquate(value_state_, tp_incident.value_state());
+ ExpectValueStatesEquate(value_state_, external_validation_value_state_,
+ tp_incident.value_state());
}
INSTANTIATE_TEST_CASE_P(
@@ -290,4 +311,18 @@ INSTANTIATE_TEST_CASE_P(
testing::Values(PrefHashStoreTransaction::CLEARED,
PrefHashStoreTransaction::CHANGED,
PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE),
+ testing::Values(PrefHashStoreTransaction::UNCHANGED,
+ PrefHashStoreTransaction::UNSUPPORTED,
+ PrefHashStoreTransaction::UNTRUSTED_UNKNOWN_VALUE),
+ testing::Bool()));
+
+INSTANTIATE_TEST_CASE_P(
+ WithBypassIncident,
+ PreferenceValidationDelegateWithIncident,
+ testing::Combine(
+ testing::Values(PrefHashStoreTransaction::UNCHANGED,
+ PrefHashStoreTransaction::SECURE_LEGACY,
+ PrefHashStoreTransaction::TRUSTED_UNKNOWN_VALUE),
+ testing::Values(PrefHashStoreTransaction::CHANGED,
+ PrefHashStoreTransaction::CLEARED),
testing::Bool()));
« no previous file with comments | « chrome/browser/safe_browsing/incident_reporting/preference_validation_delegate.cc ('k') | chrome/common/safe_browsing/csd.proto » ('j') | components/user_prefs/tracked/tracked_preference_helper.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698