Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_service_client.h

Index: chromeos/dbus/shill_service_client.h
diff --git a/chromeos/dbus/shill_service_client.h b/chromeos/dbus/shill_service_client.h
index 64f255743bb4a3885a6a094b51c3f0e53033e07a..8e75bafdd6649a7bd1a691c6a1add2d5d725f2c5 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() {}
   };