components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc - Issue 1873263002: Convert //components/data_reduction_proxy from scoped_ptr to std::unique_ptr

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: components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

Issue 1873263002: Convert //components/data_reduction_proxy from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc ('K') | « components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate_unittest.cc ('k') | components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options_unittest.cc » ('j') | components/data_reduction_proxy/core/browser/data_reduction_proxy_tamper_detection_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

diff --git a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

index 71af0f3f2958343c547aceb776b882c6dc66e386..ba55f24c6a3fdfde5d8227a0dccb724ca75eb0d0 100644

--- a/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

+++ b/components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.cc

@@ -17,7 +17,8 @@ void TransferPrefList(const char* pref_path,

PrefService* dest) {

DCHECK(src->FindPreference(pref_path)->GetType() == base::Value::TYPE_LIST);

ListPrefUpdate update_dest(dest, pref_path);

- scoped_ptr<base::ListValue> src_list(src->GetList(pref_path)->DeepCopy());

+ std::unique_ptr<base::ListValue> src_list(

+ src->GetList(pref_path)->DeepCopy());

megjablon 2016/04/12 21:55:36 #include <memory> ?

dcheng 2016/04/12 22:38:34 Done.

update_dest->Swap(src_list.get());

ListPrefUpdate update_src(src, pref_path);

src->ClearPref(pref_path);