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, 5 insertions, 8 deletions

diff --git a/chromeos/dbus/fake_shill_service_client.cc b/chromeos/dbus/fake_shill_service_client.cc
index 0bb1496..6df6ec2 100644
--- a/chromeos/dbus/fake_shill_service_client.cc
+++ b/chromeos/dbus/fake_shill_service_client.cc
@@ -308,11 +308,10 @@ void FakeShillServiceClient::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) {
+                                        bool add_to_visible_list) {
   AddServiceWithIPConfig(service_path, "" /* guid */, name,
                          type, state, "" /* ipconfig_path */,
-                         add_to_visible_list, add_to_watch_list);
+                         add_to_visible_list);
 }
 
 void FakeShillServiceClient::AddServiceWithIPConfig(
@@ -322,10 +321,9 @@ void FakeShillServiceClient::AddServiceWithIPConfig(
     const std::string& type,
     const std::string& state,
     const std::string& ipconfig_path,
-    bool add_to_visible_list,
-    bool add_to_watch_list) {
+    bool add_to_visible_list) {
   DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      AddManagerService(service_path, add_to_visible_list, add_to_watch_list);
+      AddManagerService(service_path, add_to_visible_list);
   std::string device_path =
       DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface()->
       GetDevicePathForType(type);
@@ -379,8 +377,7 @@ void FakeShillServiceClient::AddServiceWithIPConfig(
         new base::StringValue(shill::kSecurityNone));
   }
 
-  DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface()->
-      SortManagerServices();
+  CallSortManagerServices();
 
   if (!profile_path.empty()) {
     DBusThreadManager::Get()->GetShillProfileClient()->GetTestInterface()->