chrome/browser/prefs/pref_functional_browsertest.cc - Issue 1252973002: Remove the migration code from content_settings::DefaultProvider.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1252973002: Remove the migration code from content_settings::DefaultProvider. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Removed the media migration code. 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

« no previous file with comments | « chrome/browser/content_settings/host_content_settings_map_unittest.cc ('k') | components/content_settings/core/browser/content_settings_default_provider.h » ('j') | components/content_settings/core/browser/content_settings_default_provider.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_functional_browsertest.cc

diff --git a/chrome/browser/prefs/pref_functional_browsertest.cc b/chrome/browser/prefs/pref_functional_browsertest.cc

index 0a9331a20ff2d0a9ee2ec70214bd620cb75e45b0..095994176672e85d5cf8635cd48e90ff5f6c7899 100644

--- a/chrome/browser/prefs/pref_functional_browsertest.cc

+++ b/chrome/browser/prefs/pref_functional_browsertest.cc

@@ -87,10 +87,7 @@ 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, 2);

markusheintz_ 2015/07/27 08:51:32 Can you use the enum value that corresponds to the

msramek 2015/07/27 09:13:27 Done.

ui_test_utils::NavigateToURL(

browser(),