Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_service_client.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 26 matching lines @@
  public:
   typedef ShillClientHelper::PropertyChangedHandler PropertyChangedHandler;
   typedef ShillClientHelper::DictionaryValueCallback DictionaryValueCallback;
   typedef ShillClientHelper::ListValueCallback ListValueCallback;
   typedef ShillClientHelper::ErrorCallback ErrorCallback;
 
   // Interface for setting up services for testing. Accessed through
   // 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,
                             const std::string& type,
                             const std::string& state,
                             bool add_to_visible_list,
                             bool add_to_watch_list) = 0;
     virtual void AddServiceWithIPConfig(const std::string& service_path,
                                         const std::string& name,
                                         const std::string& type,
@@ skipping 10 matching lines @@
                                     const std::string& property,
                                     const base::Value& value) = 0;
 
     // Returns properties for |service_path| or NULL if no Service matches.
     virtual const base::DictionaryValue* GetServiceProperties(
         const std::string& service_path) const = 0;
 
     // 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() {}
   };
   virtual ~ShillServiceClient();
 
   // Factory function, creates a new instance which is owned by the caller.
   // For normal usage, access the singleton via DBusThreadManager::Get().
   static ShillServiceClient* Create(DBusClientImplementationType type);
 
   // Adds a property changed |observer| to the service at |service_path|.
@@ skipping 88 matching lines @@
   // Create() should be used instead.
   ShillServiceClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillServiceClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_H_