Index: components/user_prefs/tracked/interceptable_pref_filter.h |
diff --git a/components/user_prefs/tracked/interceptable_pref_filter.h b/components/user_prefs/tracked/interceptable_pref_filter.h |
index ae39d02c156444bed4890be1fb4260a6f957baf4..1f618616fd2ccede9b9b7f25f966fb075dd9ceda 100644 |
--- a/components/user_prefs/tracked/interceptable_pref_filter.h |
+++ b/components/user_prefs/tracked/interceptable_pref_filter.h |
@@ -22,15 +22,17 @@ class InterceptablePrefFilter |
// hand back the |prefs| it was handed for early filtering. |prefs_altered| |
// indicates whether the |prefs| were actually altered by the |
// FilterOnLoadInterceptor before being handed back. |
- typedef base::Callback<void(scoped_ptr<base::DictionaryValue> prefs, |
- bool prefs_altered)> FinalizeFilterOnLoadCallback; |
+ typedef base::Callback<void(std::unique_ptr<base::DictionaryValue> prefs, |
+ bool prefs_altered)> |
+ FinalizeFilterOnLoadCallback; |
// A callback to be invoked from FilterOnLoad. It takes ownership of prefs |
// and may modify them before handing them back to this |
// InterceptablePrefFilter via |finalize_filter_on_load|. |
typedef base::Callback<void( |
const FinalizeFilterOnLoadCallback& finalize_filter_on_load, |
- scoped_ptr<base::DictionaryValue> prefs)> FilterOnLoadInterceptor; |
+ std::unique_ptr<base::DictionaryValue> prefs)> |
+ FilterOnLoadInterceptor; |
InterceptablePrefFilter(); |
~InterceptablePrefFilter() override; |
@@ -38,7 +40,7 @@ class InterceptablePrefFilter |
// PrefFilter partial implementation. |
void FilterOnLoad( |
const PostFilterOnLoadCallback& post_filter_on_load_callback, |
- scoped_ptr<base::DictionaryValue> pref_store_contents) override; |
+ std::unique_ptr<base::DictionaryValue> pref_store_contents) override; |
// Registers |filter_on_load_interceptor| to intercept the next FilterOnLoad |
// event. At most one FilterOnLoadInterceptor should be registered per |
@@ -52,7 +54,7 @@ class InterceptablePrefFilter |
// initial caller of FilterOnLoad. |
virtual void FinalizeFilterOnLoad( |
const PostFilterOnLoadCallback& post_filter_on_load_callback, |
- scoped_ptr<base::DictionaryValue> pref_store_contents, |
+ std::unique_ptr<base::DictionaryValue> pref_store_contents, |
bool prefs_altered) = 0; |
// Callback to be invoked only once (and subsequently reset) on the next |