Add TestInterface methods for adding shill stub devices and services

chromeos/dbus/shill_device_client.h

Index: chromeos/dbus/shill_device_client.h
diff --git a/chromeos/dbus/shill_device_client.h b/chromeos/dbus/shill_device_client.h
index 7ac7e20099714fabf2feff2a36d2b7a51adfc164..f01643016b87a964cf9475cb8dbaf533101dae40 100644
--- a/chromeos/dbus/shill_device_client.h
+++ b/chromeos/dbus/shill_device_client.h
@@ -40,6 +40,21 @@ class CHROMEOS_EXPORT ShillDeviceClient {
   typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef ShillClientHelper::ErrorCallback ErrorCallback;
 
+  // Interface for setting up devices for testing.
+  // Accessed through GetTestInterface(), only implemented in the Stub Impl.
+  class TestInterface {
+   public:
+    virtual void AddDevice(const std::string& device_path,
+                           const std::string& type,
+                           const std::string& object_path,
+                           const std::string& connection_path) = 0;
+    virtual void RemoveDevice(const std::string& device_path) = 0;
+    virtual void ClearDevices() = 0;
+
+   protected:
+    ~TestInterface() {}
+  };
+
   virtual ~ShillDeviceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
@@ -151,6 +166,9 @@ class CHROMEOS_EXPORT ShillDeviceClient {
                           const base::Closure& callback,
                           const ErrorCallback& error_callback) = 0;
 
+  // Returns an interface for testing (stub only), or returns NULL.
+  virtual TestInterface* GetTestInterface() = 0;
+
  protected:
   // Create() should be used instead.
   ShillDeviceClient();