Remove raw base::DictionaryValue::SetWithoutPathExpansion in //chromeos

chromeos/dbus/fake_shill_ipconfig_client.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/dbus/fake_shill_ipconfig_client.h"
 
 #include "base/bind.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chromeos/dbus/shill_property_changed_observer.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
@@ skipping 35 matching lines @@
       FROM_HERE, base::Bind(&FakeShillIPConfigClient::PassProperties,
                             weak_ptr_factory_.GetWeakPtr(), dict, callback));
 }
 
 void FakeShillIPConfigClient::SetProperty(
     const dbus::ObjectPath& ipconfig_path,
     const std::string& name,
     const base::Value& value,
     const VoidDBusMethodCallback& callback) {
   base::DictionaryValue* dict = NULL;
-  if (ipconfigs_.GetDictionaryWithoutPathExpansion(ipconfig_path.value(),
-                                                   &dict)) {
-    // Update existing ip config stub object's properties.
-    dict->SetWithoutPathExpansion(name, value.DeepCopy());
-  } else {
-    // Create a new stub ipconfig object, and update its properties.
-    base::DictionaryValue* dvalue = new base::DictionaryValue;
-    dvalue->SetWithoutPathExpansion(name, value.DeepCopy());
-    ipconfigs_.SetWithoutPathExpansion(ipconfig_path.value(),
-                                       dvalue);
+  if (!ipconfigs_.GetDictionaryWithoutPathExpansion(ipconfig_path.value(),
+                                                    &dict)) {
+    dict = ipconfigs_.SetDictionaryWithoutPathExpansion(
+        ipconfig_path.value(), base::MakeUnique<base::DictionaryValue>());
   }
+  // Update existing ip config stub object's properties.
+  dict->SetWithoutPathExpansion(name, base::MakeUnique<base::Value>(value));
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
 void FakeShillIPConfigClient::ClearProperty(
     const dbus::ObjectPath& ipconfig_path,
     const std::string& name,
     const VoidDBusMethodCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
 void FakeShillIPConfigClient::Remove(const dbus::ObjectPath& ipconfig_path,
                                      const VoidDBusMethodCallback& callback) {
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS));
 }
 
 ShillIPConfigClient::TestInterface*
 FakeShillIPConfigClient::GetTestInterface() {
   return this;
 }
 
 // ShillIPConfigClient::TestInterface overrides
 
 void FakeShillIPConfigClient::AddIPConfig(
     const std::string& ip_config_path,
     const base::DictionaryValue& properties) {
-  ipconfigs_.SetWithoutPathExpansion(ip_config_path, properties.DeepCopy());
+  ipconfigs_.SetWithoutPathExpansion(ip_config_path,
+                                     base::MakeUnique<base::Value>(properties));
 }
 
 // Private methods
 
 void FakeShillIPConfigClient::PassProperties(
     const base::DictionaryValue* values,
     const DictionaryValueCallback& callback) const {
   callback.Run(DBUS_METHOD_CALL_SUCCESS, *values);
 }
 
 }  // namespace chromeos