OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chromeos/dbus/fake_shill_ipconfig_client.h" | 5 #include "chromeos/dbus/fake_shill_ipconfig_client.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/memory/ptr_util.h" |
9 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
10 #include "base/stl_util.h" | 11 #include "base/stl_util.h" |
11 #include "base/threading/thread_task_runner_handle.h" | 12 #include "base/threading/thread_task_runner_handle.h" |
12 #include "base/values.h" | 13 #include "base/values.h" |
13 #include "chromeos/dbus/shill_property_changed_observer.h" | 14 #include "chromeos/dbus/shill_property_changed_observer.h" |
14 #include "dbus/bus.h" | 15 #include "dbus/bus.h" |
15 #include "dbus/message.h" | 16 #include "dbus/message.h" |
16 #include "dbus/object_path.h" | 17 #include "dbus/object_path.h" |
17 #include "dbus/object_proxy.h" | 18 #include "dbus/object_proxy.h" |
18 #include "dbus/values_util.h" | 19 #include "dbus/values_util.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 | 58 |
58 void FakeShillIPConfigClient::SetProperty( | 59 void FakeShillIPConfigClient::SetProperty( |
59 const dbus::ObjectPath& ipconfig_path, | 60 const dbus::ObjectPath& ipconfig_path, |
60 const std::string& name, | 61 const std::string& name, |
61 const base::Value& value, | 62 const base::Value& value, |
62 const VoidDBusMethodCallback& callback) { | 63 const VoidDBusMethodCallback& callback) { |
63 base::DictionaryValue* dict = NULL; | 64 base::DictionaryValue* dict = NULL; |
64 if (ipconfigs_.GetDictionaryWithoutPathExpansion(ipconfig_path.value(), | 65 if (ipconfigs_.GetDictionaryWithoutPathExpansion(ipconfig_path.value(), |
65 &dict)) { | 66 &dict)) { |
66 // Update existing ip config stub object's properties. | 67 // Update existing ip config stub object's properties. |
67 dict->SetWithoutPathExpansion(name, value.DeepCopy()); | 68 dict->SetWithoutPathExpansion(name, value.CreateDeepCopy()); |
68 } else { | 69 } else { |
69 // Create a new stub ipconfig object, and update its properties. | 70 // Create a new stub ipconfig object, and update its properties. |
70 base::DictionaryValue* dvalue = new base::DictionaryValue; | 71 auto dvalue = base::MakeUnique<base::DictionaryValue>(); |
71 dvalue->SetWithoutPathExpansion(name, value.DeepCopy()); | 72 dvalue->SetWithoutPathExpansion(name, value.CreateDeepCopy()); |
72 ipconfigs_.SetWithoutPathExpansion(ipconfig_path.value(), | 73 ipconfigs_.SetWithoutPathExpansion(ipconfig_path.value(), |
73 dvalue); | 74 std::move(dvalue)); |
74 } | 75 } |
75 base::ThreadTaskRunnerHandle::Get()->PostTask( | 76 base::ThreadTaskRunnerHandle::Get()->PostTask( |
76 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); | 77 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); |
77 } | 78 } |
78 | 79 |
79 void FakeShillIPConfigClient::ClearProperty( | 80 void FakeShillIPConfigClient::ClearProperty( |
80 const dbus::ObjectPath& ipconfig_path, | 81 const dbus::ObjectPath& ipconfig_path, |
81 const std::string& name, | 82 const std::string& name, |
82 const VoidDBusMethodCallback& callback) { | 83 const VoidDBusMethodCallback& callback) { |
83 base::ThreadTaskRunnerHandle::Get()->PostTask( | 84 base::ThreadTaskRunnerHandle::Get()->PostTask( |
84 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); | 85 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); |
85 } | 86 } |
86 | 87 |
87 void FakeShillIPConfigClient::Remove(const dbus::ObjectPath& ipconfig_path, | 88 void FakeShillIPConfigClient::Remove(const dbus::ObjectPath& ipconfig_path, |
88 const VoidDBusMethodCallback& callback) { | 89 const VoidDBusMethodCallback& callback) { |
89 base::ThreadTaskRunnerHandle::Get()->PostTask( | 90 base::ThreadTaskRunnerHandle::Get()->PostTask( |
90 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); | 91 FROM_HERE, base::Bind(callback, DBUS_METHOD_CALL_SUCCESS)); |
91 } | 92 } |
92 | 93 |
93 ShillIPConfigClient::TestInterface* | 94 ShillIPConfigClient::TestInterface* |
94 FakeShillIPConfigClient::GetTestInterface() { | 95 FakeShillIPConfigClient::GetTestInterface() { |
95 return this; | 96 return this; |
96 } | 97 } |
97 | 98 |
98 // ShillIPConfigClient::TestInterface overrides | 99 // ShillIPConfigClient::TestInterface overrides |
99 | 100 |
100 void FakeShillIPConfigClient::AddIPConfig( | 101 void FakeShillIPConfigClient::AddIPConfig( |
101 const std::string& ip_config_path, | 102 const std::string& ip_config_path, |
102 const base::DictionaryValue& properties) { | 103 const base::DictionaryValue& properties) { |
103 ipconfigs_.SetWithoutPathExpansion(ip_config_path, properties.DeepCopy()); | 104 ipconfigs_.SetWithoutPathExpansion(ip_config_path, |
| 105 properties.CreateDeepCopy()); |
104 } | 106 } |
105 | 107 |
106 // Private methods | 108 // Private methods |
107 | 109 |
108 void FakeShillIPConfigClient::PassProperties( | 110 void FakeShillIPConfigClient::PassProperties( |
109 const base::DictionaryValue* values, | 111 const base::DictionaryValue* values, |
110 const DictionaryValueCallback& callback) const { | 112 const DictionaryValueCallback& callback) const { |
111 callback.Run(DBUS_METHOD_CALL_SUCCESS, *values); | 113 callback.Run(DBUS_METHOD_CALL_SUCCESS, *values); |
112 } | 114 } |
113 | 115 |
114 } // namespace chromeos | 116 } // namespace chromeos |
OLD | NEW |