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

Unified Diff: chromeos/dbus/fake_shill_device_client.h

Issue 31513002: dbus: Remove MockShillDeviceClient and MockShillIPConfigClient (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix the build Created 7 years, 2 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/chromeos.gyp ('k') | chromeos/dbus/fake_shill_device_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/fake_shill_device_client.h
diff --git a/chromeos/dbus/fake_shill_device_client.h b/chromeos/dbus/fake_shill_device_client.h
index c97bae17f6f8e1677f233a835910ba11b55a04fc..cb5b859ead35a5805c9f2d00a54f8c4716737da9 100644
--- a/chromeos/dbus/fake_shill_device_client.h
+++ b/chromeos/dbus/fake_shill_device_client.h
@@ -5,15 +5,19 @@
#ifndef CHROMEOS_DBUS_FAKE_SHILL_DEVICE_CLIENT_H_
#define CHROMEOS_DBUS_FAKE_SHILL_DEVICE_CLIENT_H_
-#include "base/callback_forward.h"
-#include "base/values.h"
+#include <string>
+
+#include "base/basictypes.h"
+#include "chromeos/chromeos_export.h"
#include "chromeos/dbus/shill_device_client.h"
-#include "chromeos/dbus/shill_property_changed_observer.h"
namespace chromeos {
-// A fake implementation of ShillDeviceClient. This class does nothing.
-class FakeShillDeviceClient : public ShillDeviceClient {
+// A fake implementation of ShillDeviceClient.
+// Implemented: Stub cellular device for SMS testing.
+class CHROMEOS_EXPORT FakeShillDeviceClient
+ : public ShillDeviceClient,
+ public ShillDeviceClient::TestInterface {
public:
FakeShillDeviceClient();
virtual ~FakeShillDeviceClient();
@@ -72,9 +76,44 @@ class FakeShillDeviceClient : public ShillDeviceClient {
virtual void Reset(const dbus::ObjectPath& device_path,
const base::Closure& callback,
const ErrorCallback& error_callback) OVERRIDE;
- virtual TestInterface* GetTestInterface() OVERRIDE;
+ virtual ShillDeviceClient::TestInterface* GetTestInterface() OVERRIDE;
+
+ // ShillDeviceClient::TestInterface overrides.
+ virtual void AddDevice(const std::string& device_path,
+ const std::string& type,
+ const std::string& object_path) OVERRIDE;
+ virtual void RemoveDevice(const std::string& device_path) OVERRIDE;
+ virtual void ClearDevices() OVERRIDE;
+ virtual void SetDeviceProperty(const std::string& device_path,
+ const std::string& name,
+ const base::Value& value) OVERRIDE;
+ virtual std::string GetDevicePathForType(const std::string& type) OVERRIDE;
private:
+ typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList;
+
+ void SetDefaultProperties();
+ void PassStubDeviceProperties(const dbus::ObjectPath& device_path,
+ const DictionaryValueCallback& callback) const;
+
+ // Posts a task to run a void callback with status code |status|.
+ void PostVoidCallback(const VoidDBusMethodCallback& callback,
+ DBusMethodCallStatus status);
+
+ void NotifyObserversPropertyChanged(const dbus::ObjectPath& device_path,
+ const std::string& property);
+ base::DictionaryValue* GetDeviceProperties(const std::string& device_path);
+ PropertyObserverList& GetObserverList(const dbus::ObjectPath& device_path);
+
+ // Dictionary of <device_name, Dictionary>.
+ base::DictionaryValue stub_devices_;
+ // Observer list for each device.
+ std::map<dbus::ObjectPath, PropertyObserverList*> observer_list_;
+
+ // Note: This should remain the last member so it'll be destroyed and
+ // invalidate its weak pointers before any other members are destroyed.
+ base::WeakPtrFactory<FakeShillDeviceClient> weak_ptr_factory_;
+
DISALLOW_COPY_AND_ASSIGN(FakeShillDeviceClient);
};
« no previous file with comments | « chromeos/chromeos.gyp ('k') | chromeos/dbus/fake_shill_device_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698