components/user_prefs/tracked/hash_store_contents.h - Issue 1908143002: Convert //components/user_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/user_prefs/tracked/hash_store_contents.h

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

Patch Set: Restore the rightful glory of <windows.h> 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/user_prefs/tracked/dictionary_hash_store_contents.cc ('k') | components/user_prefs/tracked/interceptable_pref_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/user_prefs/tracked/hash_store_contents.h

diff --git a/components/user_prefs/tracked/hash_store_contents.h b/components/user_prefs/tracked/hash_store_contents.h

index 94131ab77e843f780ee59c4fc0f6e64e8eb4a0c2..94323843cc18e573eb6269ca411d977cb3ff174b 100644

--- a/components/user_prefs/tracked/hash_store_contents.h

+++ b/components/user_prefs/tracked/hash_store_contents.h

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

#ifndef COMPONENTS_USER_PREFS_TRACKED_HASH_STORE_CONTENTS_H_

#define COMPONENTS_USER_PREFS_TRACKED_HASH_STORE_CONTENTS_H_

+#include <memory>

#include <string>

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

namespace base {

class DictionaryValue;

@@ -50,7 +50,7 @@ class HashStoreContents {

virtual const base::DictionaryValue* GetContents() const = 0;

// Provides mutable access to the contents of this hash store.

- virtual scoped_ptr<MutableDictionary> GetMutableContents() = 0;

+ virtual std::unique_ptr<MutableDictionary> GetMutableContents() = 0;

// Retrieves the super MAC value previously stored by SetSuperMac. May be

// empty if no super MAC has been stored.