commit fde8b32ad1bb6b192c774f8d5a0e7319415e2edc
author stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Feb 28 17:44:24 2013
committer stevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Thu Feb 28 17:44:24 2013
tree 87a5aef22a7035bd47eb0e492d9b8d38d5bd4367
parent db022e4b81125336f3ed9b8f4ae3e98cdd253e85

Improve network stub behavior
* Add Devices/Services to Manager client when addded to Device or Service client
* Do not include services for disabled technologies in service lists

BUG=none

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

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

chromeos/network/shill_property_handler_unittest.cc

diff --git a/chromeos/network/shill_property_handler_unittest.cc b/chromeos/network/shill_property_handler_unittest.cc
index d660d00..14fb74a 100644
--- a/chromeos/network/shill_property_handler_unittest.cc
+++ b/chromeos/network/shill_property_handler_unittest.cc
@@ -167,12 +167,10 @@
 
   void AddDevice(const std::string& type, const std::string& id) {
     ASSERT_TRUE(IsValidType(type));
-    manager_test_->AddDevice(id);
     device_test_->AddDevice(id, type, std::string("/device/" + id));
   }
 
   void RemoveDevice(const std::string& id) {
-    manager_test_->RemoveDevice(id);
     device_test_->RemoveDevice(id);
   }
 
@@ -181,12 +179,10 @@
                   const std::string& state,
                   bool add_to_watch_list) {
     ASSERT_TRUE(IsValidType(type));
-    manager_test_->AddService(id, add_to_watch_list);
-    service_test_->AddService(id, id, type, state);
+    service_test_->AddService(id, id, type, state, add_to_watch_list);
   }
 
   void RemoveService(const std::string& id) {
-    manager_test_->RemoveService(id);
     service_test_->RemoveService(id);
   }