Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Side by Side Diff: chromeos/dbus/shill_device_client_stub.cc

Issue 12381002: Improve network stub behavior (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: s/res/enabled Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.cc ('k') | chromeos/dbus/shill_manager_client.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/shill_device_client_stub.h" 5 #include "chromeos/dbus/shill_device_client_stub.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chromeos/dbus/dbus_thread_manager.h"
12 #include "chromeos/dbus/shill_manager_client.h"
11 #include "chromeos/dbus/shill_property_changed_observer.h" 13 #include "chromeos/dbus/shill_property_changed_observer.h"
12 #include "dbus/bus.h" 14 #include "dbus/bus.h"
13 #include "dbus/message.h" 15 #include "dbus/message.h"
14 #include "dbus/object_path.h" 16 #include "dbus/object_path.h"
15 #include "dbus/object_proxy.h" 17 #include "dbus/object_proxy.h"
16 #include "dbus/values_util.h" 18 #include "dbus/values_util.h"
17 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
18 20
19 namespace chromeos { 21 namespace chromeos {
20 22
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 196
195 ShillDeviceClient::TestInterface* ShillDeviceClientStub::GetTestInterface(){ 197 ShillDeviceClient::TestInterface* ShillDeviceClientStub::GetTestInterface(){
196 return this; 198 return this;
197 } 199 }
198 200
199 // ShillDeviceClient::TestInterface overrides. 201 // ShillDeviceClient::TestInterface overrides.
200 202
201 void ShillDeviceClientStub::AddDevice(const std::string& device_path, 203 void ShillDeviceClientStub::AddDevice(const std::string& device_path,
202 const std::string& type, 204 const std::string& type,
203 const std::string& object_path){ 205 const std::string& object_path){
206 DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
207 AddDevice(device_path);
208
204 base::DictionaryValue* properties = GetDeviceProperties(device_path); 209 base::DictionaryValue* properties = GetDeviceProperties(device_path);
205 properties->SetWithoutPathExpansion( 210 properties->SetWithoutPathExpansion(
206 flimflam::kTypeProperty, 211 flimflam::kTypeProperty,
207 base::Value::CreateStringValue(type)); 212 base::Value::CreateStringValue(type));
208 properties->SetWithoutPathExpansion( 213 properties->SetWithoutPathExpansion(
209 flimflam::kDBusObjectProperty, 214 flimflam::kDBusObjectProperty,
210 base::Value::CreateStringValue(object_path)); 215 base::Value::CreateStringValue(object_path));
211 properties->SetWithoutPathExpansion( 216 properties->SetWithoutPathExpansion(
212 flimflam::kDBusConnectionProperty, 217 flimflam::kDBusConnectionProperty,
213 base::Value::CreateStringValue("/stub")); 218 base::Value::CreateStringValue("/stub"));
214 } 219 }
215 220
216 void ShillDeviceClientStub::RemoveDevice(const std::string& device_path){ 221 void ShillDeviceClientStub::RemoveDevice(const std::string& device_path){
222 DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
223 RemoveDevice(device_path);
224
217 stub_devices_.RemoveWithoutPathExpansion(device_path, NULL); 225 stub_devices_.RemoveWithoutPathExpansion(device_path, NULL);
218 } 226 }
219 227
220 void ShillDeviceClientStub::ClearDevices(){ 228 void ShillDeviceClientStub::ClearDevices(){
229 DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
230 ClearDevices();
231
221 stub_devices_.Clear(); 232 stub_devices_.Clear();
222 } 233 }
223 234
224 void ShillDeviceClientStub::SetDeviceProperty(const std::string& device_path, 235 void ShillDeviceClientStub::SetDeviceProperty(const std::string& device_path,
225 const std::string& name, 236 const std::string& name,
226 const base::Value& value){ 237 const base::Value& value){
227 SetProperty(dbus::ObjectPath(device_path), name, value, 238 SetProperty(dbus::ObjectPath(device_path), name, value,
228 base::Bind(&base::DoNothing), 239 base::Bind(&base::DoNothing),
229 base::Bind(&ErrorFunction)); 240 base::Bind(&ErrorFunction));
230 } 241 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter = 309 std::map<dbus::ObjectPath, PropertyObserverList*>::iterator iter =
299 observer_list_.find(device_path); 310 observer_list_.find(device_path);
300 if (iter != observer_list_.end()) 311 if (iter != observer_list_.end())
301 return *(iter->second); 312 return *(iter->second);
302 PropertyObserverList* observer_list = new PropertyObserverList(); 313 PropertyObserverList* observer_list = new PropertyObserverList();
303 observer_list_[device_path] = observer_list; 314 observer_list_[device_path] = observer_list;
304 return *observer_list; 315 return *observer_list;
305 } 316 }
306 317
307 } // namespace chromeos 318 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.cc ('k') | chromeos/dbus/shill_manager_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698