| 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
|
|
|