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

Unified 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, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/dbus/dbus_thread_manager.cc ('k') | chromeos/dbus/shill_manager_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/shill_device_client_stub.cc
diff --git a/chromeos/dbus/shill_device_client_stub.cc b/chromeos/dbus/shill_device_client_stub.cc
index ee2d3b0ac44907e57add2165f4ea5949bec78285..7ede6dc615249ab4b138407235510cb8618c64e3 100644
--- a/chromeos/dbus/shill_device_client_stub.cc
+++ b/chromeos/dbus/shill_device_client_stub.cc
@@ -8,6 +8,8 @@
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/values.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/shill_manager_client.h"
#include "chromeos/dbus/shill_property_changed_observer.h"
#include "dbus/bus.h"
#include "dbus/message.h"
@@ -201,6 +203,9 @@ ShillDeviceClient::TestInterface* ShillDeviceClientStub::GetTestInterface(){
void ShillDeviceClientStub::AddDevice(const std::string& device_path,
const std::string& type,
const std::string& object_path){
+ DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+ AddDevice(device_path);
+
base::DictionaryValue* properties = GetDeviceProperties(device_path);
properties->SetWithoutPathExpansion(
flimflam::kTypeProperty,
@@ -214,10 +219,16 @@ void ShillDeviceClientStub::AddDevice(const std::string& device_path,
}
void ShillDeviceClientStub::RemoveDevice(const std::string& device_path){
+ DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+ RemoveDevice(device_path);
+
stub_devices_.RemoveWithoutPathExpansion(device_path, NULL);
}
void ShillDeviceClientStub::ClearDevices(){
+ DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
+ ClearDevices();
+
stub_devices_.Clear();
}
« 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