Remove SetWithoutPathExpansion

chromeos/network/onc/onc_translator_onc_to_shill.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.
 
 // The implementation of TranslateONCObjectToShill is structured in two parts:
 // - The recursion through the existing ONC hierarchy
 //     see TranslateONCHierarchy
 // - The local translation of an object depending on the associated signature
 //     see LocalTranslator::TranslateFields
 
@@ skipping 270 matching lines @@
   std::string ip_address_config_type, name_servers_config_type;
   onc_object_->GetStringWithoutPathExpansion(
       ::onc::network_config::kIPAddressConfigType, &ip_address_config_type);
   onc_object_->GetStringWithoutPathExpansion(
       ::onc::network_config::kNameServersConfigType, &name_servers_config_type);
   if ((ip_address_config_type == ::onc::network_config::kIPConfigTypeDHCP) ||
       (name_servers_config_type == ::onc::network_config::kIPConfigTypeDHCP)) {
     // If either type is set to DHCP, provide an empty dictionary to ensure
     // that any unset properties are cleared. Note: if either type is specified,
     // the other type defaults to DHCP if not specified.
-    shill_dictionary_->SetWithoutPathExpansion(shill::kStaticIPConfigProperty,
-                                               new base::DictionaryValue);
+    shill_dictionary_->SetWithoutPathExpansion(
+        shill::kStaticIPConfigProperty,
+        base::MakeUnique<base::DictionaryValue>());
   }
 
   const base::DictionaryValue* proxy_settings = nullptr;
   if (onc_object_->GetDictionaryWithoutPathExpansion(
           ::onc::network_config::kProxySettings, &proxy_settings)) {
     std::unique_ptr<base::DictionaryValue> proxy_config =
         ConvertOncProxySettingsToProxyConfig(*proxy_settings);
     std::string proxy_config_str;
     base::JSONWriter::Write(*proxy_config.get(), &proxy_config_str);
     shill_dictionary_->SetStringWithoutPathExpansion(
@@ skipping 27 matching lines @@
       LOG(ERROR) << "Found field " << onc_field_name << " of type "
                  << value->GetType() << " but expected type " << expected_type;
       return;
     }
   } else {
     LOG(ERROR)
         << "Attempt to translate a field that is not part of the ONC format.";
     return;
   }
   shill_dictionary_->SetWithoutPathExpansion(shill_property_name,
-                                             value->DeepCopy());
+                                             value->CreateDeepCopy());
 }
 
 void LocalTranslator::AddValueAccordingToSignature(
     const std::string& onc_name,
     std::unique_ptr<base::Value> value) {
   if (!value || !field_translation_table_)
     return;
   std::string shill_property_name;
   if (!GetShillPropertyName(onc_name, field_translation_table_,
                             &shill_property_name)) {
     return;
   }
 
   shill_dictionary_->SetWithoutPathExpansion(shill_property_name,
-                                             value.release());
+                                             std::move(value));
 }
 
 void LocalTranslator::TranslateWithTableAndSet(
     const std::string& onc_value,
     const StringTranslationEntry table[],
     const std::string& shill_property_name) {
   std::string shill_value;
   if (TranslateStringToShill(table, onc_value, &shill_value)) {
     shill_dictionary_->SetStringWithoutPathExpansion(shill_property_name,
                                                      shill_value);
@@ skipping 16 matching lines @@
   base::DictionaryValue* target_shill_dictionary = shill_dictionary;
   std::vector<std::string> path_to_shill_dictionary =
       GetPathToNestedShillDictionary(signature);
   for (std::vector<std::string>::const_iterator it =
            path_to_shill_dictionary.begin();
        it != path_to_shill_dictionary.end(); ++it) {
     base::DictionaryValue* nested_shill_dict = NULL;
     target_shill_dictionary->GetDictionaryWithoutPathExpansion(
         *it, &nested_shill_dict);
     if (!nested_shill_dict) {
-      nested_shill_dict = new base::DictionaryValue;
-      target_shill_dictionary->SetWithoutPathExpansion(*it, nested_shill_dict);
+      target_shill_dictionary->SetWithoutPathExpansion(
+          *it, base::MakeUnique<base::DictionaryValue>());
+      target_shill_dictionary->GetDictionaryWithoutPathExpansion(
+          *it, &nested_shill_dict);
     }
     target_shill_dictionary = nested_shill_dict;
   }
   // Translates fields of |onc_object| and writes them to
   // |target_shill_dictionary_| nested in |shill_dictionary|.
   LocalTranslator translator(signature, onc_object, target_shill_dictionary);
   translator.TranslateFields();
 
   // Recurse into nested objects.
   for (base::DictionaryValue::Iterator it(onc_object); !it.IsAtEnd();
@@ skipping 17 matching lines @@
     const base::DictionaryValue& onc_object) {
   CHECK(onc_signature != NULL);
   std::unique_ptr<base::DictionaryValue> shill_dictionary(
       new base::DictionaryValue);
   TranslateONCHierarchy(*onc_signature, onc_object, shill_dictionary.get());
   return shill_dictionary;
 }
 
 }  // namespace onc
 }  // namespace chromeos