chrome/browser/prefs/pref_model_associator.cc - Issue 1257093002: Remove the migration code from content_settings::PrefProvider.

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_model_associator.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/content_settings/host_content_settings_map_unittest.cc ('k') | chrome/browser/prefs/pref_model_associator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/pref_model_associator.cc

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

index 5ddbf1fbb937b8b7a3451b0e7255c7e144ec9b23..4a3bd1f5ce5e4fec86871544ec8a67d63d901274 100644

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

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

@@ -16,6 +16,7 @@

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/prefs/pref_service_syncable.h"

#include "chrome/common/pref_names.h"

+#include "components/content_settings/core/browser/content_settings_pref_provider.h"

#include "sync/api/sync_change.h"

#include "sync/api/sync_error_factory.h"

#include "sync/protocol/preference_specifics.pb.h"

@@ -323,7 +324,7 @@ scoped_ptr<base::Value> PrefModelAssociator::MergePreference(

MergeListValues(local_value, server_value)).Pass();

}

- if (name == prefs::kContentSettingsPatternPairs) {

+ if (content_settings::PrefProvider::IsContentSettingsExceptionsPref(name)) {

return scoped_ptr<base::Value>(

MergeDictionaryValues(local_value, server_value)).Pass();

}