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

Unified Diff: components/policy/core/common/registry_dict.cc

Issue 2843813002: Remove SetWithoutPathExpansion (Closed)
Patch Set: Fix CrOS Error Created 3 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/policy/core/common/registry_dict.cc
diff --git a/components/policy/core/common/registry_dict.cc b/components/policy/core/common/registry_dict.cc
index 124a2cd1100a9598231854ee563ca92a6a336489..d239d2527ccf0fa86dfc51e6ea15697f72882386 100644
--- a/components/policy/core/common/registry_dict.cc
+++ b/components/policy/core/common/registry_dict.cc
@@ -54,7 +54,7 @@ std::unique_ptr<base::Value> ConvertValue(const base::Value& value,
std::unique_ptr<base::Value> converted =
ConvertValue(entry.value(), schema.GetProperty(entry.key()));
if (converted)
- result->SetWithoutPathExpansion(entry.key(), converted.release());
+ result->SetWithoutPathExpansion(entry.key(), std::move(converted));
}
return std::move(result);
} else if (value.GetAsList(&list)) {
@@ -315,7 +315,7 @@ std::unique_ptr<base::Value> RegistryDict::ConvertToJSON(
std::unique_ptr<base::Value> converted =
ConvertValue(*entry->second, subschema);
if (converted)
- result->SetWithoutPathExpansion(entry->first, converted.release());
+ result->SetWithoutPathExpansion(entry->first, std::move(converted));
}
for (RegistryDict::KeyMap::const_iterator entry(keys_.begin());
entry != keys_.end(); ++entry) {
@@ -324,7 +324,7 @@ std::unique_ptr<base::Value> RegistryDict::ConvertToJSON(
std::unique_ptr<base::Value> converted =
entry->second->ConvertToJSON(subschema);
if (converted)
- result->SetWithoutPathExpansion(entry->first, converted.release());
+ result->SetWithoutPathExpansion(entry->first, std::move(converted));
}
return std::move(result);
}
« no previous file with comments | « components/policy/core/common/policy_test_utils.cc ('k') | components/sync_preferences/pref_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698