Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_device_client_stub.cc

Index: chromeos/dbus/shill_device_client_stub.cc
diff --git a/chromeos/dbus/shill_device_client_stub.cc b/chromeos/dbus/shill_device_client_stub.cc
index a32febd59a1c1062f3056071fcd5d266f5808bf2..c58ed2354a14c5c51593df84ccc30a80e88b256e 100644
--- a/chromeos/dbus/shill_device_client_stub.cc
+++ b/chromeos/dbus/shill_device_client_stub.cc
@@ -39,9 +39,7 @@ ShillDeviceClientStub::~ShillDeviceClientStub() {
 
 // ShillDeviceClient overrides.
 
-void ShillDeviceClientStub::Init(dbus::Bus* bus) {
-  SetDefaultProperties();
-}
+void ShillDeviceClientStub::Init(dbus::Bus* bus) {}
 
 void ShillDeviceClientStub::AddPropertyChangedObserver(
     const dbus::ObjectPath& device_path,
@@ -234,23 +232,6 @@ std::string ShillDeviceClientStub::GetDevicePathForType(
   return std::string();
 }
 
-void ShillDeviceClientStub::SetDefaultProperties() {
-  // Add a wifi device.
-  AddDevice("stub_wifi_device1", flimflam::kTypeWifi, "/device/wifi1");
-
-  // Add a cellular device. Used in SMS stub.
-  AddDevice("stub_cellular_device1", flimflam::kTypeCellular,
-            "/device/cellular1");
-  base::DictionaryValue* properties =
-      GetDeviceProperties("stub_cellular_device1");
-  properties->SetStringWithoutPathExpansion(flimflam::kCarrierProperty,
-                                            shill::kCarrierSprint);
-
-  // Add a wimax device.
-  AddDevice("stub_wimax_device1", flimflam::kTypeWimax,
-            "/device/wimax1");
-}
-
 void ShillDeviceClientStub::PassStubDeviceProperties(
     const dbus::ObjectPath& device_path,
     const DictionaryValueCallback& callback) const {