Replace misc. network stub flags with more flexible ones

chromeos/dbus/fake_shill_manager_client.h

Index: chromeos/dbus/fake_shill_manager_client.h
diff --git a/chromeos/dbus/fake_shill_manager_client.h b/chromeos/dbus/fake_shill_manager_client.h
index 65f449eb55262aa1e60afb0bd5b5b2ac919e6fb5..d937bc967dd7c67586efbdf1579d0c55a7864e4e 100644
--- a/chromeos/dbus/fake_shill_manager_client.h
+++ b/chromeos/dbus/fake_shill_manager_client.h
@@ -17,8 +17,8 @@ namespace chromeos {
 // A fake implementation of ShillManagerClient. This works in close coordination
 // with FakeShillServiceClient. FakeShillDeviceClient, and
 // FakeShillProfileClient, and is not intended to be used independently.
-class CHROMEOS_EXPORT FakeShillManagerClient :
-      public ShillManagerClient,
+class CHROMEOS_EXPORT FakeShillManagerClient
+    : public ShillManagerClient,
       public ShillManagerClient::TestInterface {
  public:
   FakeShillManagerClient();
@@ -40,27 +40,23 @@ class CHROMEOS_EXPORT FakeShillManagerClient :
   virtual void RequestScan(const std::string& type,
                            const base::Closure& callback,
                            const ErrorCallback& error_callback) OVERRIDE;
-  virtual void EnableTechnology(
-      const std::string& type,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void DisableTechnology(
-      const std::string& type,
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void ConfigureService(
-      const base::DictionaryValue& properties,
-      const ObjectPathCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void EnableTechnology(const std::string& type,
+                                const base::Closure& callback,
+                                const ErrorCallback& error_callback) OVERRIDE;
+  virtual void DisableTechnology(const std::string& type,
+                                 const base::Closure& callback,
+                                 const ErrorCallback& error_callback) OVERRIDE;
+  virtual void ConfigureService(const base::DictionaryValue& properties,
+                                const ObjectPathCallback& callback,
+                                const ErrorCallback& error_callback) OVERRIDE;
   virtual void ConfigureServiceForProfile(
       const dbus::ObjectPath& profile_path,
       const base::DictionaryValue& properties,
       const ObjectPathCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE;
-  virtual void GetService(
-      const base::DictionaryValue& properties,
-      const ObjectPathCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void GetService(const base::DictionaryValue& properties,
+                          const ObjectPathCallback& callback,
+                          const ErrorCallback& error_callback) OVERRIDE;
   virtual void VerifyDestination(const VerificationProperties& properties,
                                  const BooleanCallback& callback,
                                  const ErrorCallback& error_callback) OVERRIDE;
@@ -69,14 +65,14 @@ class CHROMEOS_EXPORT FakeShillManagerClient :
       const std::string& service_path,
       const StringCallback& callback,
       const ErrorCallback& error_callback) OVERRIDE;
-  virtual void VerifyAndEncryptData(
-      const VerificationProperties& properties,
-      const std::string& data,
-      const StringCallback& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
-  virtual void ConnectToBestServices(
-      const base::Closure& callback,
-      const ErrorCallback& error_callback) OVERRIDE;
+  virtual void VerifyAndEncryptData(const VerificationProperties& properties,
+                                    const std::string& data,
+                                    const StringCallback& callback,
+                                    const ErrorCallback& error_callback)
+      OVERRIDE;
+  virtual void ConnectToBestServices(const base::Closure& callback,
+                                     const ErrorCallback& error_callback)
+      OVERRIDE;
   virtual ShillManagerClient::TestInterface* GetTestInterface() OVERRIDE;
 
   // ShillManagerClient::TestInterface overrides.
@@ -103,8 +99,7 @@ class CHROMEOS_EXPORT FakeShillManagerClient :
   void SetDefaultProperties();
   void PassStubProperties(const DictionaryValueCallback& callback) const;
   void PassStubGeoNetworks(const DictionaryValueCallback& callback) const;
-  void CallNotifyObserversPropertyChanged(const std::string& property,
-                                          int delay_ms);
+  void CallNotifyObserversPropertyChanged(const std::string& property);
   void NotifyObserversPropertyChanged(const std::string& property);
   base::ListValue* GetListProperty(const std::string& property);
   bool TechnologyEnabled(const std::string& type) const;