Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Unified Diff: components/user_prefs/tracked/segregated_pref_store.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
Index: components/user_prefs/tracked/segregated_pref_store.h
diff --git a/components/user_prefs/tracked/segregated_pref_store.h b/components/user_prefs/tracked/segregated_pref_store.h
index 2f52f01ce77c01f09d7cfc0033606231c2fbe891..016cca6d0490de2de4a5ce4ff08063eec6fe38ba 100644
--- a/components/user_prefs/tracked/segregated_pref_store.h
+++ b/components/user_prefs/tracked/segregated_pref_store.h
@@ -7,13 +7,13 @@
#include <stdint.h>
+#include <memory>
#include <set>
#include <string>
#include "base/compiler_specific.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "components/prefs/persistent_pref_store.h"
@@ -55,7 +55,7 @@ class SegregatedPrefStore : public PersistentPrefStore {
// WriteablePrefStore implementation
void SetValue(const std::string& key,
- scoped_ptr<base::Value> value,
+ std::unique_ptr<base::Value> value,
uint32_t flags) override;
void RemoveValue(const std::string& key, uint32_t flags) override;
@@ -63,7 +63,7 @@ class SegregatedPrefStore : public PersistentPrefStore {
bool GetMutableValue(const std::string& key, base::Value** result) override;
void ReportValueChanged(const std::string& key, uint32_t flags) override;
void SetValueSilently(const std::string& key,
- scoped_ptr<base::Value> value,
+ std::unique_ptr<base::Value> value,
uint32_t flags) override;
bool ReadOnly() const override;
PrefReadError GetReadError() const override;
@@ -104,7 +104,7 @@ class SegregatedPrefStore : public PersistentPrefStore {
scoped_refptr<PersistentPrefStore> selected_pref_store_;
std::set<std::string> selected_preference_names_;
- scoped_ptr<PersistentPrefStore::ReadErrorDelegate> read_error_delegate_;
+ std::unique_ptr<PersistentPrefStore::ReadErrorDelegate> read_error_delegate_;
base::ObserverList<PrefStore::Observer, true> observers_;
AggregatingObserver aggregating_observer_;

Powered by Google App Engine
This is Rietveld 408576698