summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/pref_functional_browsertest.cc
diff options
context:
space:
mode:
authormsramek <msramek@chromium.org>2015-07-27 09:00:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-07-27 16:00:32 +0000
commit9681220b472add22fd10d1034d667c2160c4247d (patch)
treedb21d9420f8c150b5a82638b246ed83441965f6d /chrome/browser/prefs/pref_functional_browsertest.cc
parent5bfe0b4c88575acf2ad5e26c16f00b867ef4899a (diff)
downloadchromium_src-9681220b472add22fd10d1034d667c2160c4247d.zip
chromium_src-9681220b472add22fd10d1034d667c2160c4247d.tar.gz
chromium_src-9681220b472add22fd10d1034d667c2160c4247d.tar.bz2
Remove the migration code from content_settings::DefaultProvider.
The migration of default content settings from one dictionary pref into individual prefs appeared in M43. The next branchpoint is M46. After three versions, it is safe to remove the migration code. Question: What happens to users who weren't migrated during this time (i.e. jump from M<43 to M>=46)? Answer: Their content settings will be reset, since their individual prefs will not be populated. However, their profile won't be damaged; the old dictionary will be simply ignored. Thus, the user will have their settings restored to default values, as if in a new profile. For the more sensitive settings, the user will be asked before a permission is granted to the site; however, for cookies, images and javascript the default value is to allow websites to use them. TESTED=Change in the settings UI was correctly reflected in the same window, in incognito window, and for synced settings also on a synced computer. BUG=452388 Review URL: https://codereview.chromium.org/1252973002 Cr-Commit-Position: refs/heads/master@{#340475}
Diffstat (limited to 'chrome/browser/prefs/pref_functional_browsertest.cc')
-rw-r--r--chrome/browser/prefs/pref_functional_browsertest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc
index 0a9331a..642d9fa 100644
--- a/chrome/browser/prefs/pref_functional_browsertest.cc
+++ b/chrome/browser/prefs/pref_functional_browsertest.cc
@@ -87,10 +87,8 @@ IN_PROC_BROWSER_TEST_F(PrefsFunctionalTest, TestImageContentSettings) {
&result));
EXPECT_TRUE(result);
- base::DictionaryValue value;
- value.SetInteger("images", 2);
- browser()->profile()->GetPrefs()->Set(prefs::kDefaultContentSettings,
- value);
+ browser()->profile()->GetPrefs()->SetInteger(
+ prefs::kDefaultImagesSetting, CONTENT_SETTING_BLOCK);
ui_test_utils::NavigateToURL(
browser(),