components/prefs/testing_pref_service.h - Issue 1907043002: Convert //components/prefs 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/prefs/testing_pref_service.h

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

Patch Set: IWYU fixes 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

« no previous file with comments | « components/prefs/pref_value_store_unittest.cc ('k') | components/prefs/testing_pref_store.h » ('j') | components/user_prefs/tracked/interceptable_pref_filter.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/prefs/testing_pref_service.h

diff --git a/components/prefs/testing_pref_service.h b/components/prefs/testing_pref_service.h

index 756858907f11709d667d421aa68131b3a28fab47..f29e506d853ae28a830a0ad68e49f1c30352f3ec 100644

--- a/components/prefs/testing_pref_service.h

+++ b/components/prefs/testing_pref_service.h

@@ -5,9 +5,11 @@

#ifndef COMPONENTS_PREFS_TESTING_PREF_SERVICE_H_

#define COMPONENTS_PREFS_TESTING_PREF_SERVICE_H_

+#include <memory>

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/memory/ref_counted.h"

-#include "base/memory/scoped_ptr.h"

#include "components/prefs/pref_registry.h"

#include "components/prefs/pref_service.h"

#include "components/prefs/testing_pref_store.h"

@@ -183,7 +185,7 @@ void TestingPrefServiceBase<SuperPrefService, ConstructionPrefRegistry>::

SetPref(TestingPrefStore* pref_store,

const std::string& path,

base::Value* value) {

- pref_store->SetValue(path, make_scoped_ptr(value),

+ pref_store->SetValue(path, base::WrapUnique(value),

WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS);

}