chrome/browser/content_settings/content_settings_pref_provider.cc - Issue 568173004: Use base::StringPairs where appropriate from /chrome

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/content_settings/content_settings_pref_provider.cc

Issue 568173004: Use base::StringPairs where appropriate from /chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/chromeos/drive/resource_metadata_storage_unittest.cc ('k') | chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc

index 0046dd303dc54597e1d1921869334d115c873ca0..66f058c9f38704db687636741042073bfa6e9dfc 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc

@@ -14,6 +14,7 @@

#include "base/metrics/histogram.h"

#include "base/prefs/pref_service.h"

#include "base/prefs/scoped_user_pref_update.h"

+#include "base/strings/string_split.h"

#include "base/time/clock.h"

#include "base/time/default_clock.h"

#include "chrome/browser/content_settings/content_settings_rule.h"

@@ -509,7 +510,7 @@ void PrefProvider::CanonicalizeContentSettingsExceptions(

DCHECK(all_settings_dictionary);

std::vector<std::string> remove_items;

- std::vector<std::pair<std::string, std::string> > move_items;

+ base::StringPairs move_items;

for (base::DictionaryValue::Iterator i(*all_settings_dictionary);

!i.IsAtEnd();

i.Advance()) {