Index: base/prefs/json_pref_store.cc |
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc |
index 22036de6c81be2c7f7544148c019e19a854f4287..637ec70b81f1eafacccd5a691f17ec4db4481bc8 100644 |
--- a/base/prefs/json_pref_store.cc |
+++ b/base/prefs/json_pref_store.cc |
@@ -5,6 +5,7 @@ |
#include "base/prefs/json_pref_store.h" |
#include <algorithm> |
+#include <utility> |
#include "base/bind.h" |
#include "base/callback.h" |
@@ -126,7 +127,7 @@ scoped_ptr<JsonPrefStore::ReadResult> ReadPrefsFromDisk( |
if (read_result->error == PersistentPrefStore::PREF_READ_ERROR_NONE) |
RecordJsonDataSizeHistogram(path, deserializer.get_last_read_size()); |
- return read_result.Pass(); |
+ return read_result; |
} |
} // namespace |
@@ -149,8 +150,7 @@ JsonPrefStore::JsonPrefStore( |
: JsonPrefStore(pref_filename, |
base::FilePath(), |
sequenced_task_runner, |
- pref_filter.Pass()) { |
-} |
+ std::move(pref_filter)) {} |
JsonPrefStore::JsonPrefStore( |
const base::FilePath& pref_filename, |
@@ -163,7 +163,7 @@ JsonPrefStore::JsonPrefStore( |
prefs_(new base::DictionaryValue()), |
read_only_(false), |
writer_(pref_filename, sequenced_task_runner), |
- pref_filter_(pref_filter.Pass()), |
+ pref_filter_(std::move(pref_filter)), |
initialized_(false), |
filtering_in_progress_(false), |
pending_lossy_write_(false), |
@@ -225,7 +225,7 @@ void JsonPrefStore::SetValue(const std::string& key, |
base::Value* old_value = nullptr; |
prefs_->Get(key, &old_value); |
if (!old_value || !value->Equals(old_value)) { |
- prefs_->Set(key, value.Pass()); |
+ prefs_->Set(key, std::move(value)); |
ReportValueChanged(key, flags); |
} |
} |
@@ -239,7 +239,7 @@ void JsonPrefStore::SetValueSilently(const std::string& key, |
base::Value* old_value = nullptr; |
prefs_->Get(key, &old_value); |
if (!old_value || !value->Equals(old_value)) { |
- prefs_->Set(key, value.Pass()); |
+ prefs_->Set(key, std::move(value)); |
ScheduleWrite(flags); |
} |
} |
@@ -377,9 +377,10 @@ void JsonPrefStore::OnFileRead(scoped_ptr<ReadResult> read_result) { |
&JsonPrefStore::FinalizeFileRead, AsWeakPtr(), |
initialization_successful)); |
pref_filter_->FilterOnLoad(post_filter_on_load_callback, |
- unfiltered_prefs.Pass()); |
+ std::move(unfiltered_prefs)); |
} else { |
- FinalizeFileRead(initialization_successful, unfiltered_prefs.Pass(), false); |
+ FinalizeFileRead(initialization_successful, std::move(unfiltered_prefs), |
+ false); |
} |
} |
@@ -419,7 +420,7 @@ void JsonPrefStore::FinalizeFileRead(bool initialization_successful, |
return; |
} |
- prefs_ = prefs.Pass(); |
+ prefs_ = std::move(prefs); |
initialized_ = true; |