Clean up shill fake implementations

This is in preparation of merging NetworkState and FavoriteState,
crbug.com/375955.

The merge will involve a number of changes to ShillPropertyHandler
and in the process of making those changes some additional logging
and test cleanup was necessary that isn't directly related to the
merge itself.

BUG=none
For trivial changes to chrome/browser/ui/webui/options/
TBR=dbeam@chromium.org

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

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

1 files changed, 2 insertions, 4 deletions

diff --git a/chromeos/dbus/shill_service_client.h b/chromeos/dbus/shill_service_client.h
index 5e2e6de..40507fe 100644
--- a/chromeos/dbus/shill_service_client.h
+++ b/chromeos/dbus/shill_service_client.h
@@ -48,16 +48,14 @@ class CHROMEOS_EXPORT ShillServiceClient : public DBusClient {
                             const std::string& name,
                             const std::string& type,
                             const std::string& state,
-                            bool add_to_visible_list,
-                            bool add_to_watch_list) = 0;
+                            bool add_to_visible_list) = 0;
     virtual void AddServiceWithIPConfig(const std::string& service_path,
                                         const std::string& guid,
                                         const std::string& name,
                                         const std::string& type,
                                         const std::string& state,
                                         const std::string& ipconfig_path,
-                                        bool add_to_visible_list,
-                                        bool add_to_watch_list) = 0;
+                                        bool add_to_visible_list) = 0;
 
     // Removes a Service to the Manager and Service stubs.
     virtual void RemoveService(const std::string& service_path) = 0;