Remove SetWithoutPathExpansion

chromeos/network/onc/onc_merger.cc

Index: chromeos/network/onc/onc_merger.cc
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 41c6b5807ee89e13a9cc7b8a3169451ec6de8bec..83653bdf9b19749abc8ef95a1e56bfc08df15739 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -76,8 +76,8 @@ DictionaryPtr GetEditableFlags(const base::DictionaryValue& policy) {
       continue;
     }
 
-    result_editable->SetWithoutPathExpansion(
-        it.key(), GetEditableFlags(*child_policy).release());
+    result_editable->SetWithoutPathExpansion(it.key(),
+                                             GetEditableFlags(*child_policy));
   }
   return result_editable;
 }
@@ -139,7 +139,7 @@ class MergeListOfDictionaries {
         }
 
         if (merged_value)
-          result->SetWithoutPathExpansion(key, merged_value.release());
+          result->SetWithoutPathExpansion(key, std::move(merged_value));
       }
     }
     return result;
@@ -415,7 +415,8 @@ class MergeToAugmented : public MergeToEffective {
 
     if (values.active_setting) {
       augmented_value->SetWithoutPathExpansion(
-          ::onc::kAugmentationActiveSetting, values.active_setting->DeepCopy());
+          ::onc::kAugmentationActiveSetting,
+          values.active_setting->CreateDeepCopy());
     }
 
     if (!which_effective.empty()) {
@@ -430,22 +431,24 @@ class MergeToAugmented : public MergeToEffective {
     if (!is_credential) {
       if (values.user_policy) {
         augmented_value->SetWithoutPathExpansion(
-            ::onc::kAugmentationUserPolicy, values.user_policy->DeepCopy());
+            ::onc::kAugmentationUserPolicy,
+            values.user_policy->CreateDeepCopy());
       }
       if (values.device_policy) {
         augmented_value->SetWithoutPathExpansion(
             ::onc::kAugmentationDevicePolicy,
-            values.device_policy->DeepCopy());
+            values.device_policy->CreateDeepCopy());
       }
     }
     if (values.user_setting) {
       augmented_value->SetWithoutPathExpansion(
-          ::onc::kAugmentationUserSetting, values.user_setting->DeepCopy());
+          ::onc::kAugmentationUserSetting,
+          values.user_setting->CreateDeepCopy());
     }
     if (values.shared_setting) {
       augmented_value->SetWithoutPathExpansion(
           ::onc::kAugmentationSharedSetting,
-          values.shared_setting->DeepCopy());
+          values.shared_setting->CreateDeepCopy());
     }
     if (HasUserPolicy() && values.user_editable) {
       augmented_value->SetBooleanWithoutPathExpansion(