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

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: 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/prefs/pref_model_associator.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | components/content_settings/core/browser/content_settings_pref.h » ('j') | components/content_settings/core/browser/content_settings_pref_provider.h » ('J')
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..b49d8644e313da077558cc9909b6985d688e0eef 100644
--- a/chrome/browser/prefs/pref_model_associator_unittest.cc
+++ b/chrome/browser/prefs/pref_model_associator_unittest.cc
@@ -222,9 +222,9 @@ class DictionaryPreferenceMergeTest : public AbstractPreferenceMergeTest {
};
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 +236,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);
}
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,34 +256,36 @@ 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);
}
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);
}
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;
@@ -297,7 +299,7 @@ TEST_F(DictionaryPreferenceMergeTest, MergeNoConflicts) {
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);
@@ -306,9 +308,9 @@ TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) {
}
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;
@@ -323,7 +325,7 @@ TEST_F(DictionaryPreferenceMergeTest, MergeConflicts) {
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);
@@ -331,9 +333,9 @@ TEST_F(DictionaryPreferenceMergeTest, Equal) {
}
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,7 +343,7 @@ 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);
@@ -349,9 +351,9 @@ TEST_F(DictionaryPreferenceMergeTest, ConflictButServerWins) {
}
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_));
}
« chrome/browser/prefs/pref_model_associator.cc ('K') | « chrome/browser/prefs/pref_model_associator.cc ('k') | components/content_settings/core/browser/content_settings_pref.h » ('j') | components/content_settings/core/browser/content_settings_pref_provider.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698