Refactor the setup of Shill*Stubs' default environment.

chromeos/dbus/shill_manager_client_stub.cc

Index: chromeos/dbus/shill_manager_client_stub.cc
diff --git a/chromeos/dbus/shill_manager_client_stub.cc b/chromeos/dbus/shill_manager_client_stub.cc
index 061487488e93375a8dc5bf40c496db1d3724dee9..cd368df810b7b5bf860f4b3ca75c2cf197fb23cc 100644
--- a/chromeos/dbus/shill_manager_client_stub.cc
+++ b/chromeos/dbus/shill_manager_client_stub.cc
@@ -17,7 +17,6 @@
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
-#include "dbus/object_proxy.h"
 #include "dbus/values_util.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
@@ -84,9 +83,7 @@ ShillManagerClientStub::~ShillManagerClientStub() {}
 
 // ShillManagerClient overrides.
 
-void ShillManagerClientStub::Init(dbus::Bus* bus) {
-  SetDefaultProperties();
-}
+void ShillManagerClientStub::Init(dbus::Bus* bus) {}
 
 void ShillManagerClientStub::AddPropertyChangedObserver(
     ShillPropertyChangedObserver* observer) {
@@ -491,17 +488,6 @@ void ShillManagerClientStub::AddServiceToWatchList(
       flimflam::kServiceWatchListProperty, 0);
 }
 
-void ShillManagerClientStub::SetDefaultProperties() {
-  // Stub Technologies.
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(
-          chromeos::switches::kDisableStubEthernet)) {
-    AddTechnology(flimflam::kTypeEthernet, true);
-  }
-  AddTechnology(flimflam::kTypeWifi, true);
-  AddTechnology(flimflam::kTypeCellular, true);
-  AddTechnology(flimflam::kTypeWimax, true);
-}
-
 void ShillManagerClientStub::PassStubProperties(
     const DictionaryValueCallback& callback) const {
   scoped_ptr<base::DictionaryValue> stub_properties(