components/user_prefs/tracked/tracked_preferences_migration.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/tracked_preferences_migration.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/segregated_pref_store_unittest.cc ('k') | components/user_prefs/tracked/tracked_preferences_migration.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/user_prefs/tracked/tracked_preferences_migration.h

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

index fecc002265752f9ea7ef1a785f39f7d18f52ce84..3b5939228bbb8be5e44cfa384147a3332e9ac640 100644

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

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

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

#ifndef COMPONENTS_USER_PREFS_TRACKED_TRACKED_PREFERENCES_MIGRATION_H_

#define COMPONENTS_USER_PREFS_TRACKED_TRACKED_PREFERENCES_MIGRATION_H_

+#include <memory>

#include <set>

#include <string>

#include "base/callback_forward.h"

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

#include "components/user_prefs/tracked/pref_hash_store.h"

class HashStoreContents;

@@ -39,9 +39,9 @@ void SetupTrackedPreferencesMigration(

register_on_successful_unprotected_store_write_callback,

const base::Callback<void(const base::Closure&)>&

register_on_successful_protected_store_write_callback,

- scoped_ptr<PrefHashStore> unprotected_pref_hash_store,

- scoped_ptr<PrefHashStore> protected_pref_hash_store,

- scoped_ptr<HashStoreContents> legacy_pref_hash_store,

+ std::unique_ptr<PrefHashStore> unprotected_pref_hash_store,

+ std::unique_ptr<PrefHashStore> protected_pref_hash_store,

+ std::unique_ptr<HashStoreContents> legacy_pref_hash_store,

InterceptablePrefFilter* unprotected_pref_filter,

InterceptablePrefFilter* protected_pref_filter);