Remove SetWithoutPathExpansion

chromeos/network/policy_util.cc

 // Copyright 2013 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 "chromeos/network/policy_util.h"
 
 #include <utility>
 
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chromeos/network/network_profile.h"
 #include "chromeos/network/network_ui_data.h"
 #include "chromeos/network/onc/onc_merger.h"
 #include "chromeos/network/onc/onc_normalizer.h"
 #include "chromeos/network/onc/onc_signature.h"
 #include "chromeos/network/onc/onc_translator.h"
 #include "chromeos/network/onc/onc_utils.h"
 #include "chromeos/network/shill_property_util.h"
 #include "components/onc/onc_constants.h"
@@ skipping 137 matching lines @@
 
   bool autoconnect = false;
   network_dict->GetBooleanWithoutPathExpansion(autoconnect_key, &autoconnect);
   return autoconnect;
 }
 
 base::DictionaryValue* GetOrCreateDictionary(const std::string& key,
                                              base::DictionaryValue* dict) {
   base::DictionaryValue* inner_dict = NULL;
   if (!dict->GetDictionaryWithoutPathExpansion(key, &inner_dict)) {
-    inner_dict = new base::DictionaryValue;
-    dict->SetWithoutPathExpansion(key, inner_dict);
+    dict->SetWithoutPathExpansion(key,
+                                  base::MakeUnique<base::DictionaryValue>());
+    dict->GetDictionaryWithoutPathExpansion(key, &inner_dict);
   }
   return inner_dict;
 }
 
 base::DictionaryValue* GetOrCreateNestedDictionary(
     const std::string& key1,
     const std::string& key2,
     base::DictionaryValue* dict) {
   base::DictionaryValue* inner_dict = GetOrCreateDictionary(key1, dict);
   return GetOrCreateDictionary(key2, inner_dict);
@@ skipping 223 matching lines @@
   for (auto it = policies.begin(); it != policies.end(); ++it) {
     if (IsPolicyMatching(*it->second, actual_network))
       return it->second.get();
   }
   return NULL;
 }
 
 }  // namespace policy_util
 
 }  // namespace chromeos