Update PrefService::SetDefaultPrefValue() to new base::Value APIs.
The existing implementation took a raw base::Value* pointer and depended
on a comment to explain ownership semantics.
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I79aeea59537056350bb87f37ca2f458b28f46484
Reviewed-on: https://chromium-review.googlesource.com/722352
Commit-Queue: Lei Zhang <[email protected]>
Reviewed-by: Bernhard Bauer <[email protected]>
Reviewed-by: Olivier Robin <[email protected]>
Reviewed-by: Ryan Sleevi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#509989}diff --git a/components/prefs/pref_service.cc b/components/prefs/pref_service.cc
index 39552b9..f4976b2 100644
--- a/components/prefs/pref_service.cc
+++ b/components/prefs/pref_service.cc
@@ -29,15 +29,18 @@
class ReadErrorHandler : public PersistentPrefStore::ReadErrorDelegate {
public:
- ReadErrorHandler(base::Callback<void(PersistentPrefStore::PrefReadError)> cb)
- : callback_(cb) {}
+ using ErrorCallback =
+ base::Callback<void(PersistentPrefStore::PrefReadError)>;
+ explicit ReadErrorHandler(ErrorCallback cb) : callback_(cb) {}
void OnError(PersistentPrefStore::PrefReadError error) override {
callback_.Run(error);
}
private:
- base::Callback<void(PersistentPrefStore::PrefReadError)> callback_;
+ ErrorCallback callback_;
+
+ DISALLOW_COPY_AND_ASSIGN(ReadErrorHandler);
};
// Returns the WriteablePrefStore::PrefWriteFlags for the pref with the given
@@ -323,9 +326,9 @@
}
void PrefService::SetDefaultPrefValue(const std::string& path,
- base::Value* value) {
+ base::Value value) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
- pref_registry_->SetDefaultPrefValue(path, value);
+ pref_registry_->SetDefaultPrefValue(path, std::move(value));
}
const base::Value* PrefService::GetDefaultPrefValue(
@@ -558,7 +561,7 @@
}
const base::Value* PrefService::Preference::GetValue() const {
- const base::Value* result= pref_service_->GetPreferenceValue(name_);
+ const base::Value* result = pref_service_->GetPreferenceValue(name_);
DCHECK(result) << "Must register pref before getting its value";
return result;
}
