Remove SetWithoutPathExpansion

components/sync_preferences/pref_model_associator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync_preferences/pref_model_associator.h"
 
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/json/json_reader.h"
@@ skipping 301 matching lines @@
       static_cast<const base::DictionaryValue&>(to_value);
   base::DictionaryValue* result = to_dict_value.DeepCopy();
 
   for (base::DictionaryValue::Iterator it(from_dict_value); !it.IsAtEnd();
        it.Advance()) {
     const base::Value* from_key_value = &it.value();
     base::Value* to_key_value;
     if (result->GetWithoutPathExpansion(it.key(), &to_key_value)) {
       if (from_key_value->GetType() == base::Value::Type::DICTIONARY &&
           to_key_value->GetType() == base::Value::Type::DICTIONARY) {
-        base::Value* merged_value =
-            MergeDictionaryValues(*from_key_value, *to_key_value);
-        result->SetWithoutPathExpansion(it.key(), merged_value);
+        std::unique_ptr<base::Value> merged_value(
+            MergeDictionaryValues(*from_key_value, *to_key_value));
+        result->SetWithoutPathExpansion(it.key(), std::move(merged_value));
       }
       // Note that for all other types we want to preserve the "to"
       // values so we do nothing here.
     } else {
-      result->SetWithoutPathExpansion(it.key(), from_key_value->DeepCopy());
+      result->SetWithoutPathExpansion(it.key(),
+                                      from_key_value->CreateDeepCopy());
     }
   }
   return result;
 }
 
 // Note: This will build a model of all preferences registered as syncable
 // with user controlled data. We do not track any information for preferences
 // not registered locally as syncable and do not inform the syncer of
 // non-user controlled preferences.
 syncer::SyncDataList PrefModelAssociator::GetAllSyncData(
@@ skipping 184 matching lines @@
                                                     bool from_sync) const {
   auto observer_iter = synced_pref_observers_.find(path);
   if (observer_iter == synced_pref_observers_.end())
     return;
   SyncedPrefObserverList* observers = observer_iter->second.get();
   for (auto& observer : *observers)
     observer.OnSyncedPrefChanged(path, from_sync);
 }
 
 }  // namespace sync_preferences