Refactor the setup of Shill*Stubs' default environment.

This change untangles some of the Shill*Stubs' implementation from the setup of a default network environment. In particular the setup function has now access to all Shill*Stubs during this setup.

This also correctly adds stub networks with status 'online' to a profile, so that the respective FavoriteState is created.

BUG=126870
R=stevenjb@chromium.org

Review URL: https://codereview.chromium.org/24150004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224756 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

diff --git a/chromeos/dbus/shill_service_client.h b/chromeos/dbus/shill_service_client.h
index 64f2557..8e75baf 100644
--- a/chromeos/dbus/shill_service_client.h
+++ b/chromeos/dbus/shill_service_client.h
@@ -44,10 +44,6 @@ class CHROMEOS_EXPORT ShillServiceClient : public DBusClient {
   // GetTestInterface(), only implemented in the stub implementation.
   class TestInterface {
    public:
-    // Adds a set of default services. Must be called after all Shill
-    // clients have been created.
-    virtual void AddDefaultServices() = 0;
-
     // Adds a Service to the Manager and Service stubs.
     virtual void AddService(const std::string& service_path,
                             const std::string& name,
@@ -78,6 +74,9 @@ class CHROMEOS_EXPORT ShillServiceClient : public DBusClient {
     // Clears all Services from the Manager and Service stubs.
     virtual void ClearServices() = 0;
 
+    virtual void SetConnectBehavior(const std::string& service_path,
+                                    const base::Closure& behavior) = 0;
+
    protected:
     virtual ~TestInterface() {}
   };