Improve network stub behavior

chromeos/dbus/shill_service_client_stub.h

 // Copyright (c) 2013 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_STUB_H_
 #define CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_
 
 #include <map>
 #include <string>
 
@@ skipping 53 matching lines @@
       const ErrorCallback& error_callback) OVERRIDE;
   virtual bool CallActivateCellularModemAndBlock(
       const dbus::ObjectPath& service_path,
       const std::string& carrier) OVERRIDE;
   virtual ShillServiceClient::TestInterface* GetTestInterface() OVERRIDE;
 
   // ShillServiceClient::TestInterface overrides.
   virtual void AddService(const std::string& service_path,
                           const std::string& name,
                           const std::string& type,
-                          const std::string& state) OVERRIDE;
+                          const std::string& state,
+                          bool add_to_watch_list) OVERRIDE;
   virtual void RemoveService(const std::string& service_path) OVERRIDE;
   virtual void SetServiceProperty(const std::string& service_path,
                                   const std::string& property,
                                   const base::Value& value) OVERRIDE;
+  virtual const base::DictionaryValue* GetServiceProperties(
+      const std::string& service_path) const OVERRIDE;
   virtual void ClearServices() OVERRIDE;
 
  private:
   typedef ObserverList<ShillPropertyChangedObserver> PropertyObserverList;
 
   void SetDefaultProperties();
   void PassStubServiceProperties(const dbus::ObjectPath& service_path,
                                  const DictionaryValueCallback& callback);
   void NotifyObserversPropertyChanged(const dbus::ObjectPath& service_path,
                                       const std::string& property);
-  base::DictionaryValue* GetServiceProperties(const std::string& service_path);
+  base::DictionaryValue* GetModifiableServiceProperties(
+      const std::string& service_path);
   PropertyObserverList& GetObserverList(const dbus::ObjectPath& device_path);
 
   base::DictionaryValue stub_services_;
   // Observer list for each service.
   std::map<dbus::ObjectPath, PropertyObserverList*> observer_list_;
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<ShillServiceClientStub> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillServiceClientStub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_SERVICE_CLIENT_STUB_H_