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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/prefs/pref_model_associator_unittest.cc

Issue 1257093002: Remove the migration code from content_settings::PrefProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the tests. Created 5 years, 5 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
« chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | components/content_settings/core/browser/content_settings_pref.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_model_associator_unittest.cc
diff --git a/chrome/browser/prefs/pref_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc
index 14b2508bed7e6a4e280b64f94a0ef798d3efac1b..74c5288f5ca554e1d0166ad5ed326e47cd534394 100644
--- a/chrome/browser/prefs/pref_model_associator_unittest.cc
+++ b/chrome/browser/prefs/pref_model_associator_unittest.cc
@@ -17,7 +17,6 @@ class AbstractPreferenceMergeTest : public testing::Test {
void SetContentPattern(base::DictionaryValue* patterns_dict,
const std::string& expression,
- const std::string& content_type,
int setting) {
base::DictionaryValue* expression_dict;
bool found =
@@ -28,7 +27,7 @@ class AbstractPreferenceMergeTest : public testing::Test {
patterns_dict->SetWithoutPathExpansion(expression, expression_dict);
}
expression_dict->SetWithoutPathExpansion(
- content_type, new base::FundamentalValue(setting));
+ "setting", new base::FundamentalValue(setting));
}
void SetPrefToEmpty(const std::string& pref_name) {
@@ -203,28 +202,28 @@ class DictionaryPreferenceMergeTest : public AbstractPreferenceMergeTest {
expression0_("expression0"),
expression1_("expression1"),
expression2_("expression2"),
- content_type0_("content_type0"),
- content_type1_("content_type1") {}
+ expression3_("expression3"),
+ expression4_("expression4") {}
void SetUp() override {
AbstractPreferenceMergeTest::SetUp();
- SetContentPattern(&server_patterns_, expression0_, content_type0_, 1);
- SetContentPattern(&server_patterns_, expression0_, content_type1_, 2);
- SetContentPattern(&server_patterns_, expression1_, content_type0_, 1);
+ SetContentPattern(&server_patterns_, expression0_, 1);
+ SetContentPattern(&server_patterns_, expression1_, 2);
+ SetContentPattern(&server_patterns_, expression2_, 1);
}
std::string expression0_;
std::string expression1_;
std::string expression2_;
- std::string content_type0_;
- std::string content_type1_;
+ std::string expression3_;
+ std::string expression4_;
base::DictionaryValue server_patterns_;
};
TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
- SetPrefToEmpty(prefs::kContentSettingsPatternPairs);
+ SetPrefToEmpty(prefs::kContentSettingsImagesPatternPairs);
const PrefService::Preference* pref =
- pref_service_->FindPreference(prefs::kContentSettingsPatternPairs);
+ pref_service_->FindPreference(prefs::kContentSettingsImagesPatternPairs);
scoped_ptr<base::Value> merged_value(
PrefModelAssociator::MergePreference(pref->name(),
*pref->GetValue(),
@@ -236,19 +235,19 @@ TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
scoped_ptr<base::Value> null_value = base::Value::CreateNullValue();
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsCookiesPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression3_, 1);
}
const PrefService::Preference* pref =
- pref_service_->FindPreference(prefs::kContentSettingsPatternPairs);
+ pref_service_->FindPreference(prefs::kContentSettingsCookiesPatternPairs);
scoped_ptr<base::Value> merged_value(
PrefModelAssociator::MergePreference(pref->name(),
*pref->GetValue(),
*null_value));
const base::DictionaryValue* local_dict_value =
- pref_service_->GetDictionary(prefs::kContentSettingsPatternPairs);
+ pref_service_->GetDictionary(prefs::kContentSettingsCookiesPatternPairs);
EXPECT_TRUE(merged_value->Equals(local_dict_value));
}
@@ -256,84 +255,86 @@ TEST_F(DictionaryPreferenceMergeTest, ServerEmpty) {
scoped_ptr<base::Value> empty_value(new base::DictionaryValue);
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsPluginsPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression3_, 1);
}
const PrefService::Preference* pref =
- pref_service_->FindPreference(prefs::kContentSettingsPatternPairs);
+ pref_service_->FindPreference(
+ prefs::kContentSettingsPluginsPatternPairs);
scoped_ptr<base::Value> merged_value(
PrefModelAssociator::MergePreference(pref->name(),
*pref->GetValue(),
*empty_value));
const base::DictionaryValue* local_dict_value =
- pref_service_->GetDictionary(prefs::kContentSettingsPatternPairs);
+ pref_service_->GetDictionary(
+ prefs::kContentSettingsPluginsPatternPairs);
EXPECT_TRUE(merged_value->Equals(local_dict_value));
}
TEST_F(DictionaryPreferenceMergeTest, MergeNoConflicts) {
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsJavaScriptPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression2_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression3_, 1);
}
scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
- prefs::kContentSettingsPatternPairs,
- *pref_service_->FindPreference(prefs::kContentSettingsPatternPairs)->
- GetValue(),
+ prefs::kContentSettingsJavaScriptPatternPairs,
+ *pref_service_->FindPreference(
+ prefs::kContentSettingsJavaScriptPatternPairs)->GetValue(),
server_patterns_));
base::DictionaryValue expected;
- SetContentPattern(&expected, expression0_, content_type0_, 1);
- SetContentPattern(&expected, expression0_, content_type1_, 2);
- SetContentPattern(&expected, expression1_, content_type0_, 1);
- SetContentPattern(&expected, expression2_, content_type0_, 1);
+ SetContentPattern(&expected, expression0_, 1);
+ SetContentPattern(&expected, expression1_, 2);
+ SetContentPattern(&expected, expression2_, 1);
+ SetContentPattern(&expected, expression3_, 1);
EXPECT_TRUE(merged_value->Equals(&expected));
}
TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) {
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsPopupsPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression0_, content_type0_, 2);
- SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
- SetContentPattern(local_dict_value, expression1_, content_type1_, 1);
- SetContentPattern(local_dict_value, expression2_, content_type0_, 2);
+ SetContentPattern(local_dict_value, expression0_, 2);
+ SetContentPattern(local_dict_value, expression2_, 1);
+ SetContentPattern(local_dict_value, expression3_, 1);
+ SetContentPattern(local_dict_value, expression4_, 2);
}
scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
- prefs::kContentSettingsPatternPairs,
- *pref_service_->FindPreference(prefs::kContentSettingsPatternPairs)->
- GetValue(),
+ prefs::kContentSettingsPopupsPatternPairs,
+ *pref_service_->FindPreference(
+ prefs::kContentSettingsPopupsPatternPairs)->GetValue(),
server_patterns_));
base::DictionaryValue expected;
- SetContentPattern(&expected, expression0_, content_type0_, 1);
- SetContentPattern(&expected, expression0_, content_type1_, 2);
- SetContentPattern(&expected, expression1_, content_type0_, 1);
- SetContentPattern(&expected, expression1_, content_type1_, 1);
- SetContentPattern(&expected, expression2_, content_type0_, 2);
+ SetContentPattern(&expected, expression0_, 1);
+ SetContentPattern(&expected, expression1_, 2);
+ SetContentPattern(&expected, expression2_, 1);
+ SetContentPattern(&expected, expression3_, 1);
+ SetContentPattern(&expected, expression4_, 2);
EXPECT_TRUE(merged_value->Equals(&expected));
}
TEST_F(DictionaryPreferenceMergeTest, Equal) {
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsMouseLockPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression0_, content_type0_, 1);
- SetContentPattern(local_dict_value, expression0_, content_type1_, 2);
- SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression0_, 1);
+ SetContentPattern(local_dict_value, expression1_, 2);
+ SetContentPattern(local_dict_value, expression2_, 1);
}
scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
- prefs::kContentSettingsPatternPairs,
- *pref_service_->
- FindPreference(prefs::kContentSettingsPatternPairs)->GetValue(),
+ prefs::kContentSettingsMouseLockPatternPairs,
+ *pref_service_->FindPreference(
+ prefs::kContentSettingsMouseLockPatternPairs)->GetValue(),
server_patterns_));
EXPECT_TRUE(merged_value->Equals(&server_patterns_));
}
@@ -341,17 +342,17 @@ TEST_F(DictionaryPreferenceMergeTest, Equal) {
TEST_F(DictionaryPreferenceMergeTest, ConflictButServerWins) {
{
DictionaryPrefUpdate update(pref_service_,
- prefs::kContentSettingsPatternPairs);
+ prefs::kContentSettingsFullScreenPatternPairs);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression0_, content_type0_, 2);
- SetContentPattern(local_dict_value, expression0_, content_type1_, 2);
- SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression0_, 2);
+ SetContentPattern(local_dict_value, expression1_, 2);
+ SetContentPattern(local_dict_value, expression2_, 1);
}
scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
- prefs::kContentSettingsPatternPairs,
- *pref_service_->
- FindPreference(prefs::kContentSettingsPatternPairs)->GetValue(),
+ prefs::kContentSettingsFullScreenPatternPairs,
+ *pref_service_->FindPreference(
+ prefs::kContentSettingsFullScreenPatternPairs)->GetValue(),
server_patterns_));
EXPECT_TRUE(merged_value->Equals(&server_patterns_));
}
@@ -362,13 +363,12 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
url0_("http://example.com/server0"),
url1_("http://example.com/server1"),
expression0_("expression0"),
- expression1_("expression1"),
- content_type0_("content_type0") {}
+ expression1_("expression1") {}
void SetUp() override {
AbstractPreferenceMergeTest::SetUp();
server_url_list_.Append(new base::StringValue(url0_));
- SetContentPattern(&server_patterns_, expression0_, content_type0_, 1);
+ SetContentPattern(&server_patterns_, expression0_, 1);
}
bool MergeListPreference(const char* pref) {
@@ -393,7 +393,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
{
DictionaryPrefUpdate update(pref_service_, pref);
base::DictionaryValue* local_dict_value = update.Get();
- SetContentPattern(local_dict_value, expression1_, content_type0_, 1);
+ SetContentPattern(local_dict_value, expression1_, 1);
}
scoped_ptr<base::Value> merged_value(PrefModelAssociator::MergePreference(
@@ -402,8 +402,8 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
server_patterns_));
base::DictionaryValue expected;
- SetContentPattern(&expected, expression0_, content_type0_, 1);
- SetContentPattern(&expected, expression1_, content_type0_, 1);
+ SetContentPattern(&expected, expression0_, 1);
+ SetContentPattern(&expected, expression1_, 1);
return merged_value->Equals(&expected);
}
« chrome/browser/content_settings/content_settings_pref_provider_unittest.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | components/content_settings/core/browser/content_settings_pref.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698