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

Unified Diff: components/sync_preferences/pref_model_associator.h

Issue 2884933002: Remove raw base::DictionaryValue::SetWithoutPathExpansion (Closed)
Patch Set: Include Created 3 years, 7 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/sync_preferences/pref_model_associator.h
diff --git a/components/sync_preferences/pref_model_associator.h b/components/sync_preferences/pref_model_associator.h
index 033b19c8dfcbd282bf5edf506bdda61514af0bae..2afbef011e29fbe19b19638cd27e7c854937fe3a 100644
--- a/components/sync_preferences/pref_model_associator.h
+++ b/components/sync_preferences/pref_model_associator.h
@@ -141,10 +141,12 @@ class PrefModelAssociator : public syncer::SyncableService,
const std::string& pref_name,
syncer::SyncChangeList* sync_changes);
- static base::Value* MergeListValues(const base::Value& from_value,
- const base::Value& to_value);
- static base::Value* MergeDictionaryValues(const base::Value& from_value,
- const base::Value& to_value);
+ static std::unique_ptr<base::Value> MergeListValues(
+ const base::Value& from_value,
+ const base::Value& to_value);
+ static std::unique_ptr<base::Value> MergeDictionaryValues(
+ const base::Value& from_value,
+ const base::Value& to_value);
// Do we have an active association between the preferences and sync models?
// Set when start syncing, reset in StopSyncing. While this is not set, we
« no previous file with comments | « components/policy/core/common/registry_dict.cc ('k') | components/sync_preferences/pref_model_associator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698